summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-05-16 22:10:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-16 22:10:13 -0700
commit6d2c1c2dc064c40f6c723e0a25b5f813732fdaff (patch)
treed53c34b99bff8a19a1932064473852ac2953d6d3 /Documentation
parentReplace in-place sed in t7502-commit (diff)
parentgit-filter-branch: Clarify file removal example. (diff)
downloadtgif-6d2c1c2dc064c40f6c723e0a25b5f813732fdaff.tar.xz
Merge branch 'maint'
* maint: git-filter-branch: Clarify file removal example.
Diffstat (limited to 'Documentation')
-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 8d80f0d074..506c37af70 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:
--------------------------------------------------------------------------