mirror of
https://github.com/git/git
synced 2024-09-18 07:51:35 +00:00
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>
This commit is contained in:
parent
b1ecd8cfdf
commit
9074925341
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue