summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-09-14 07:55:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-14 07:55:32 (GMT)
commit611d8139e4e0a78797a0821074fc94a4f8d74b7b (patch)
tree992e3bebcce5faf2dc81e3dd7b6df84ade69b477 /Documentation
parent568d2cde9b9fe0fc6b3202c7987b13289cb1a4a0 (diff)
parent8419d2ee9ba8b375186a5c1019df8dfbce610aba (diff)
downloadgit-611d8139e4e0a78797a0821074fc94a4f8d74b7b.zip
git-611d8139e4e0a78797a0821074fc94a4f8d74b7b.tar.gz
git-611d8139e4e0a78797a0821074fc94a4f8d74b7b.tar.bz2
Merge branch 'maint'
* maint: git-format-patch --in-reply-to: accept <message@id> with angle brackets git-add -u: do not barf on type changes Remove duplicate note about removing commits with git-filter-branch git-clone: improve error message if curl program is missing or not executable hooks--update: Explicitly check for all zeros for a deleted ref.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-filter-branch.txt5
1 files changed, 0 insertions, 5 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 29bb8ce..c878ed3 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -220,11 +220,6 @@ git filter-branch --commit-filter '
fi' HEAD
------------------------------------------------------------------------------
-Note that the changes introduced by the commits, and not reverted by
-subsequent commits, will still be in the rewritten branch. If you want
-to throw out _changes_ together with the commits, you should use the
-interactive mode of gitlink:git-rebase[1].
-
The function 'skip_commits' is defined as follows:
--------------------------