summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com>2009-04-10 14:26:49 +0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-12 14:30:40 -0700
commitc6d8f7635f619f6576dccf17c1f1264d2cc37a2a (patch)
treebfa933edb4efcfb17a4e744fb535e40ee000f2e3
parentprocess_{tree,blob}: Remove useless xstrdup calls (diff)
downloadtgif-c6d8f7635f619f6576dccf17c1f1264d2cc37a2a.tar.xz
State the effect of filter-branch on graft explicitly
Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-filter-branch.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index b0e710d5f9..7747c4877d 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -31,6 +31,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.
+
*WARNING*! The rewritten history will have different object names for all
the objects and will not converge with the original branch. You will not
be able to easily push and distribute the rewritten branch on top of the