diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 05:19:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 05:19:03 (GMT) |
| commit | 77cdf8c6f9d142a8d9693531d442ffa0712874d6 (patch) | |
| tree | 33fb9d829abc6a46aa02ab25778573cef23d2e4c /Documentation | |
| parent | 01ae81e028f35fedac97e6e44336305786c3f14c (diff) | |
| parent | c25d98b2a730cbc63033ba3360df2519d43a40cd (diff) | |
| download | git-77cdf8c6f9d142a8d9693531d442ffa0712874d6.zip git-77cdf8c6f9d142a8d9693531d442ffa0712874d6.tar.gz git-77cdf8c6f9d142a8d9693531d442ffa0712874d6.tar.bz2 | |
Merge branch 'jc/merge-x-theirs-docfix' into maint
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 |