Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: git-filter-branch honors replacement refs
author
Peter Collingbourne
<peter@pcc.me.uk>
Thu, 21 Jul 2011 15:10:52 +0000
(16:10 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 21 Jul 2011 19:54:55 +0000
(12:54 -0700)
Make it clear that git-filter-branch will honor and make permanent
replacement refs as well as grafts.
Signed-off-by: Peter Collingbourne <peter@pcc.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-filter-branch.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
6e8e67f
)
diff --git
a/Documentation/git-filter-branch.txt
b/Documentation/git-filter-branch.txt
index 9dc1f2a94708d40daf428a427dd2ea4256cc172a..0f2f1173834bdee77bd1d8d77e070af07a7b3580 100644
(file)
--- a/
Documentation/git-filter-branch.txt
+++ b/
Documentation/git-filter-branch.txt
@@
-32,8
+32,9
@@
changes, which would normally have no effect. Nevertheless, this may be
useful in the future for compensating for some git bugs or such,
therefore such a usage is permitted.
useful in the future for compensating for some git bugs or such,
therefore such a usage is permitted.
-*NOTE*: This command honors `.git/info/grafts`. If you have any grafts
-defined, running this command will make them permanent.
+*NOTE*: This command honors `.git/info/grafts` and `.git/refs/replace/`.
+If you have any grafts or replacement refs defined, running this command
+will make them permanent.
*WARNING*! The rewritten history will have different object names for all
the objects and will not converge with the original branch. You will not
*WARNING*! The rewritten history will have different object names for all
the objects and will not converge with the original branch. You will not