Documentation/replace: state that objects must be of the same type
A previous patch ensures that both the replaced and the replacement objects passed to git replace must be of the same type, except if -f option is used. While at it state that there is no other restriction on both objects. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder committed
Sep 6, 2013 at 07:10 UTC
160df71ef53b0ad645391ec7d5525eda33871d09
1 file changed
+6
-3
Documentation/git-replace.txt
+6
-3
@@ -20,8 +20,13 @@ The name of the 'replace' reference is the SHA-1 of the object that is
20
replaced. The content of the 'replace' reference is the SHA-1 of the
21
replacement object.
22
23
+The replaced object and the replacement object must be of the same type.
24
+This restriction can be bypassed using `-f`.
25
+
26
Unless `-f` is given, the 'replace' reference must not yet exist.
27
28
+There is no other restriction on the replaced and replacement objects.
29
+
30
Replacement references will be used by default by all Git commands
31
except those doing reachability traversal (prune, pack transfer and
32
fsck).
@@ -69,9 +74,7 @@ go back to a replaced commit will move the branch to the replacement
74
commit instead of the replaced commit.
75
76
There may be other problems when using 'git rev-list' related to
72
-pending objects. And of course things may break if an object of one
73
-type is replaced by an object of another type (for example a blob
74
-replaced by a commit).
77
+pending objects.
78
79
SEE ALSO
80
--------