Browse Source

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>
maint
Philip Oakley 11 years ago committed by Junio C Hamano
parent
commit
9074925341
  1. 1
      Documentation/git-replace.txt

1
Documentation/git-replace.txt

@ -26,6 +26,7 @@ This restriction can be bypassed using `-f`. @@ -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

Loading…
Cancel
Save