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>
Philip Oakley committed
Sep 8, 2013 at 13:10 UTC
907492534118a88d071676e78fe4bd1427189a37
1 file changed
+1
Documentation/git-replace.txt
+1
@@ -26,6 +26,7 @@ This restriction can be bypassed using `-f`.
26
Unless `-f` is given, the 'replace' reference must not yet exist.
27
28
There is no other restriction on the replaced and replacement objects.
29
+Merge commits can be replaced by non-merge commits and vice versa.
30
31
Replacement references will be used by default by all Git commands
32
except those doing reachability traversal (prune, pack transfer and