From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 14 Sep 2007 22:05:49 GMT
Subject: Re: [PATCH] Remove duplicate note about removing commits with git-filter-branch
Message-ID: <Pine.LNX.4.64.0709142305180.28586@racer.site>
In-Reply-To: <7vk5qteqto.fsf@gitster.siamese.dyndns.org>

Hi,

On Thu, 13 Sep 2007, Junio C Hamano wrote:

> ulrik <ulrik.sverdrup@gmail.com> writes:
> 
> > A duplicate of an already existing section in the documentation of
> > git-filter-branch was added in commit
> > f95eef15f2f8a336b9a42749f5458c841a5a5d63.
> > This patch removes that redundant section.
> >
> > Signed-off-by: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
> > ---
> >  Documentation/git-filter-branch.txt |    5 -----
> >  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:
> 
> Hmph, sharp eyes.  I suspect that this could have been my
> screwup.

Yep, I confirm this was my screwup.  Thanks for fixing this, Ulrik!

Ciao,
Dscho