Skip to content

Commit 9074925

Browse files
Philip Oakleygitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b1ecd8c commit 9074925

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Documentation/git-replace.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ This restriction can be bypassed using `-f`.
2626
Unless `-f` is given, the 'replace' reference must not yet exist.
2727

2828
There is no other restriction on the replaced and replacement objects.
29+
Merge commits can be replaced by non-merge commits and vice versa.
2930

3031
Replacement references will be used by default by all Git commands
3132
except those doing reachability traversal (prune, pack transfer and

0 commit comments

Comments
 (0)