diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-28 15:34:39 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-28 15:34:39 +0900 |
| commit | f088858b7d9cf7778d88910914cf7c34d0fdeb83 (patch) | |
| tree | 9218886e61e3784e2ef626190f39003136bb75ad /merge-strategies.txt | |
| parent | 20c484eb042459f279c89d562aaf9d77dc2f7862 (diff) | |
| download | git-htmldocs-f088858b7d9cf7778d88910914cf7c34d0fdeb83.tar.gz | |
Autogenerated HTML docs for v2.14.2-642-g20fed
Diffstat (limited to 'merge-strategies.txt')
| -rw-r--r-- | merge-strategies.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-strategies.txt b/merge-strategies.txt index 2eb92b932..a09d59746 100644 --- a/merge-strategies.txt +++ b/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 |