projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 01ae81e c25d98b)
Merge branch 'jc/merge-x-theirs-docfix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:03 +0000 (14:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:03 +0000 (14:19 +0900)
commit77cdf8c6f9d142a8d9693531d442ffa0712874d6
tree33fb9d829abc6a46aa02ab25778573cef23d2e4ctree | snapshot
parent01ae81e028f35fedac97e6e44336305786c3f14ccommit | diff
parentc25d98b2a730cbc63033ba3360df2519d43a40cdcommit | diff
Merge branch 'jc/merge-x-theirs-docfix' into maint

The documentation for '-X<option>' for merges was misleadingly
written to suggest that "-s theirs" exists, which is not the case.

* jc/merge-x-theirs-docfix:
  merge-strategies: avoid implying that "-s theirs" exists
Unnamed repository; edit this file 'description' to name the repository.