From: "Christian Couder" <chrisc...@tuxfamily.org>
Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
Documentation/git-replace.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-replace.txt
index 736b48c..a2bd2ee 100644
@@ -21,10 +21,12 @@ replaced. The content of the 'replace' reference
is the SHA-1 of the
The replaced object and the replacement object must be of the same
-There is no other restriction on them.
+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
Is this trying to allude to the fact that merge commits may be exchanged
with non-merge commits? I strongly believe that this ability to exchange
merge and non-merge commits should be stated _explicitly_ to counteract
the false beliefs that are listed out on the internet.
It's probably better stated in a separate patch for that explicit
purpose to avoid mixed messages within this commit.
Replacement references will be used by default by all Git commands
except those doing reachability traversal (prune, pack transfer and
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html