summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2011-07-21 15:10:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-07-21 19:54:55 (GMT)
commit0dc310e8608c05f40be3390607f301ffc4284e6d (patch)
tree9df09812114b35d23f21784f6c0b79509ab3243b
parent6e8e67f3071ecdc139f6a77f90afee50b5ec1664 (diff)
downloadgit-0dc310e8608c05f40be3390607f301ffc4284e6d.zip
git-0dc310e8608c05f40be3390607f301ffc4284e6d.tar.gz
git-0dc310e8608c05f40be3390607f301ffc4284e6d.tar.bz2
Documentation: git-filter-branch honors replacement refs
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>
-rw-r--r--Documentation/git-filter-branch.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 9dc1f2a..0f2f117 100644
--- 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.
-*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