[PATCH] Doc: 'replace' merge and non-merge commits

From: Philip Oakley <philipoakley@iee.org>
Date: Sep 8, 2013, 12:10 UTC
Message-ID: <1378642244-3572-1-git-send-email-philipoakley@iee.org>
In-Reply-To: <xmqqob86g8v4.fsf@gitster.dls.corp.google.com>

Merges are often treated as special case objects so tell users that they are not special here.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
---

This updates my in-line patch given in [PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check ($gmane/233997 05 September 2013 23:20) and Junio's comments ($gmane/234001 06 September 2013 00:13)

Applies on top of pu and Christian Couder's series.

Philip

---
 Documentation/git-replace.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 414000e..f373ab4 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt
@@ -26,6 +26,7 @@ This restriction can be bypassed using `-f`.
 Unless `-f` is given, the 'replace' reference must not yet exist.
 
 There is no other restriction on the replaced and replacement objects.
+Merge commits can be replaced by non-merge commits and vice versa.
 
 Replacement references will be used by default by all Git commands
 except those doing reachability traversal (prune, pack transfer and

-- 
1.8.1.msysgit.1