mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-21 12:48:32 +02:00
Code

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

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-09-28 14:47:57 +09:00
commit 4da3e234f5
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.
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;;
With this option, 'merge-recursive' spends a little extra time