summaryrefslogtreecommitdiff
path: root/Documentation/git-filter-branch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-17 05:10:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-17 05:10:13 (GMT)
commit6d2c1c2dc064c40f6c723e0a25b5f813732fdaff (patch)
treed53c34b99bff8a19a1932064473852ac2953d6d3 /Documentation/git-filter-branch.txt
parentd16d5cdf59f44e412525a270885488fccb8e4e30 (diff)
parente4d594c6bdcb25b996120fe21c901af7a08a7f6d (diff)
downloadgit-6d2c1c2dc064c40f6c723e0a25b5f813732fdaff.zip
git-6d2c1c2dc064c40f6c723e0a25b5f813732fdaff.tar.gz
git-6d2c1c2dc064c40f6c723e0a25b5f813732fdaff.tar.bz2
Merge branch 'maint'
* maint: git-filter-branch: Clarify file removal example.
Diffstat (limited to 'Documentation/git-filter-branch.txt')
-rw-r--r--Documentation/git-filter-branch.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 8d80f0d..506c37a 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -183,6 +183,10 @@ or copyright violation) from all commits:
git filter-branch --tree-filter 'rm filename' HEAD
-------------------------------------------------------
+However, if the file is absent from the tree of some commit,
+a simple `rm filename` will fail for that tree and commit.
+Thus you may instead want to use `rm -f filename` as the script.
+
A significantly faster version:
--------------------------------------------------------------------------