undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/merge-x-theirs-docfix' into maint

Browse Source 
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
This commit is contained in:
Junio C Hamano 2017-10-18 14:19:03 +09:00
commit 77cdf8c6f9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/merge-strategies.txt
View File

@ -39,7 +39,8 @@ even look at what the other tree contains at all. It discards everything
the other tree did, declaring 'our' history contains all that happened in it. the other tree did, declaring 'our' history contains all that happened in it.
theirs;; theirs;;
This is the opposite of 'ours'. This is the opposite of 'ours'; note that, unlike 'ours', there is
no 'theirs' merge stragegy to confuse this merge option with.
patience;; patience;;
With this option, 'merge-recursive' spends a little extra time With this option, 'merge-recursive' spends a little extra time