Doc: 'replace' merge and non-merge commits

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 414000ef7d74e96dae5db7c86fd6bffc63b353cd..f373ab48d4d575d847408e333b5bfb747d1a75a2 100644 (file)
--- 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.
 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
 
 Replacement references will be used by default by all Git commands
 except those doing reachability traversal (prune, pack transfer and