Skip to content

Commit

Permalink
Doc: 'replace' merge and non-merge commits
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Philip Oakley authored and Junio C Hamano committed Sep 9, 2013
1 parent b1ecd8c commit 9074925
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions Documentation/git-replace.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9074925

Please sign in to comment.