summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Oakley <philipoakley@iee.org>2013-09-08 13:10:44 +0100
committerJunio C Hamano <gitster@pobox.com>2013-09-09 08:16:30 -0700
commit907492534118a88d071676e78fe4bd1427189a37 (patch)
tree6d63bd32312d87fc7a1595b49860fbb4ce8cad01
parentb1ecd8cfdfc46bcb3d2c06cf0dbaf6d1ebe41e3c (diff)
downloadgit-907492534118a88d071676e78fe4bd1427189a37.tar.gz
Doc: 'replace' merge and non-merge commitscc/replace-with-the-same-type
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>
-rw-r--r--Documentation/git-replace.txt1
1 files changed, 1 insertions, 0 deletions
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