summaryrefslogtreecommitdiff
path: root/Documentation/git-filter-branch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-12 23:01:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-12 23:01:25 (GMT)
commita54c4edc511608fdba513cc94812c31fd4b497f6 (patch)
tree53dea1be73208c23be4cdf2aec37894de8415889 /Documentation/git-filter-branch.txt
parentee7ec2f9ded03700f2b95cc1d4b3d60ed374132a (diff)
parent3bd1bb327eb4d3e386800897734f9f42b48280ff (diff)
downloadgit-a54c4edc511608fdba513cc94812c31fd4b497f6.zip
git-a54c4edc511608fdba513cc94812c31fd4b497f6.tar.gz
git-a54c4edc511608fdba513cc94812c31fd4b497f6.tar.bz2
Merge branch 'maint'
* maint: GIT 1.6.2.3 State the effect of filter-branch on graft explicitly process_{tree,blob}: Remove useless xstrdup calls Conflicts: GIT-VERSION-GEN
Diffstat (limited to 'Documentation/git-filter-branch.txt')
-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 237f85e..ab527b5 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