projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 47d26f0 c25d98b)
Merge branch 'jc/merge-x-theirs-docfix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Sep 2017 05:47:57 +0000 (14:47 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Sep 2017 05:47:57 +0000 (14:47 +0900)
commit4da3e234f5a3989328c4dc8368cf5906f8679b30
tree23d86e9fdcd61fc73422c9efc8e35eb8c959d3b3tree | snapshot
parent47d26f0a66de017d7516e3414517eb5898f3723fcommit | diff
parentc25d98b2a730cbc63033ba3360df2519d43a40cdcommit | diff
Merge branch 'jc/merge-x-theirs-docfix'

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.