From: Philip Oakley Date: Sun, 8 Sep 2013 12:10:44 +0000 (+0100) Subject: Doc: 'replace' merge and non-merge commits X-Git-Tag: v1.8.5-rc0~76^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/907492534118a88d071676e78fe4bd1427189a37?ds=inline;hp=--cc 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 Signed-off-by: Junio C Hamano --- 907492534118a88d071676e78fe4bd1427189a37 diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 414000ef7d..f373ab48d4 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