From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Sep 2017 05:47:57 +0000 (+0900)
Subject: Merge branch 'jc/merge-x-theirs-docfix'
X-Git-Tag: v2.15.0-rc0~37
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4da3e234f5a3989328c4dc8368cf5906f8679b30?hp=47d26f0a66de017d7516e3414517eb5898f3723f

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
---

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