diff options
| author | Philip Oakley <philipoakley@iee.org> | 2013-09-08 14:10:44 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-09 17:16:30 +0200 |
| commit | 907492534118a88d071676e78fe4bd1427189a37 (patch) | |
| tree | 6d63bd32312d87fc7a1595b49860fbb4ce8cad01 /Documentation/git-replace.txt | |
| parent | t6050-replace: use some long option names (diff) | |
| download | git-907492534118a88d071676e78fe4bd1427189a37.tar.xz git-907492534118a88d071676e78fe4bd1427189a37.zip | |
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>
Diffstat (limited to 'Documentation/git-replace.txt')
| -rw-r--r-- | Documentation/git-replace.txt | 1 |
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 |