diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-25 14:34:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-25 14:34:23 +0900 |
| commit | c25d98b2a730cbc63033ba3360df2519d43a40cd (patch) | |
| tree | 28a8cc8b488949c0ca6a3563fadc94382758a94b | |
| parent | 0bfff8146f8c055fd95af4567286929ba8216fa7 (diff) | |
| download | git-jc/merge-x-theirs-docfix.tar.gz | |
merge-strategies: avoid implying that "-s theirs" existsjc/merge-x-theirs-docfix
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>
| -rw-r--r-- | Documentation/merge-strategies.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 2eb92b9327..a09d597463 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -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 |