From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Feb 2009 22:47:52 GMT
Subject: Re: [PATCH] Add 'rm -f' equivalent to 'git rm' example of filter-branch --index-filter
Message-ID: <7v4oyzjmqv.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1234461670-25657-1-git-send-email-jacob.helwig@gmail.com>

Jacob Helwig <jacob.helwig@gmail.com> writes:

> Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com>
> ---
>  Documentation/git-filter-branch.txt |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
> index 451950b..1fbbbb4 100644
> --- a/Documentation/git-filter-branch.txt
> +++ b/Documentation/git-filter-branch.txt
> @@ -212,6 +212,11 @@ git filter-branch --index-filter 'git rm --cached filename' HEAD
>  
>  Now, you will get the rewritten history saved in HEAD.
>  
> +As with using `rm filename`, `git rm --cached filename` will fail
> +if the file is absent from the tree of a commit.  If it is not important
> +whether the file is already absent from the tree, you can use
> +`git rm --cached --ignore-unmatch filename` instead.
> +
>  To rewrite the repository to look as if `foodir/` had been its project
>  root, and discard all other history:


Looks sane to me.  Objections?