Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index a3edc0024600e34d956b8e8d76dd8a6a8bd6c8bd..a518ba6072127afce1b117a6c70022415979d079 100644 (file)
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -167,7 +167,7 @@ to other tags will be rewritten to point to the underlying commit.
        directory or when there are already refs starting with
        'refs/original/', unless forced.
 
-<rev-list-options>::
+<rev-list options>...::
        When options are given after the new branch name, they will
        be passed to 'git-rev-list'.  Only commits in the resulting
        output will be filtered, although the filtered commits can still
@@ -191,7 +191,7 @@ Thus you may instead want to use `rm -f filename` as the script.
 A significantly faster version:
 
 --------------------------------------------------------------------------
-git filter-branch --index-filter 'git update-index --remove filename' HEAD
+git filter-branch --index-filter 'git rm --cached filename' HEAD
 --------------------------------------------------------------------------
 
 Now, you will get the rewritten history saved in HEAD.