development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-14 05:45:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Doc: 'replace' merge and non-merge commits

Browse source 
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>
This commit is contained in:
Philip Oakley 2013-09-08 13:10:44 +01:00 committed by Junio C Hamano
parent b1ecd8cfdf
commit 9074925341
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Documentation/git-replace.txt
View file

@ -26,6 +26,7 @@ This restriction can be bypassed using `-f`.
Unless `-f` is given, the 'replace' reference must not yet exist. Unless `-f` is given, the 'replace' reference must not yet exist.
There is no other restriction on the replaced and replacement objects. 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 Replacement references will be used by default by all Git commands
except those doing reachability traversal (prune, pack transfer and except those doing reachability traversal (prune, pack transfer and