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

merge-strategies: avoid implying that "-s theirs" exists

Browse Source 
The description of `-Xours` merge option has a parenthetical note
that tells the readers that it is very different from `-s ours`,
which is correct, but the description of `-Xtheirs` that follows it
carelessly says "this is the opposite of `ours`", giving a false
impression that the readers also need to be warned that it is very
different from `-s theirs`, which in reality does not even exist.

Clarify it a bit to avoid misleading readers.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2017-09-25 14:34:23 +09:00
parent 0bfff8146f
commit c25d98b2a7
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