diff options
| -rw-r--r-- | Documentation/git-replace.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 414000ef7d..f373ab48d4 100644 --- a/Documentation/git-replace.txt +++ b/Documentation/git-replace.txt @@ -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 |