diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-28 05:47:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-28 05:47:57 (GMT) |
| commit | 4da3e234f5a3989328c4dc8368cf5906f8679b30 (patch) | |
| tree | 23d86e9fdcd61fc73422c9efc8e35eb8c959d3b3 /Documentation | |
| parent | 47d26f0a66de017d7516e3414517eb5898f3723f (diff) | |
| parent | c25d98b2a730cbc63033ba3360df2519d43a40cd (diff) | |
| download | git-4da3e234f5a3989328c4dc8368cf5906f8679b30.zip git-4da3e234f5a3989328c4dc8368cf5906f8679b30.tar.gz git-4da3e234f5a3989328c4dc8368cf5906f8679b30.tar.bz2 | |
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
Diffstat (limited to 'Documentation')
| -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 2eb92b9..a09d597 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 |