Re: [RFC] Replace rebase with filtering

From: Jakub Narebski <jnareb@gmail.com>
Date: Jan 16, 2007, 21:49 UTC
Message-ID: <eojh8r$9e6$1@sea.gmane.org>
In-Reply-To: <Pine.LNX.4.63.0701162218070.22628@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin wrote:

> Usually, however, this results in a conflict which you have to resolve. 
> And _you_ do not have a hard time verifying that the patch already went 
> in, and you just say "git rebase --skip" and the rebasing will continue 
> _without_ having committed the now obsolete patch.

Unfortunately, at least with git 1.4.4.x, not quite. You have to have index clean to do "git rebase --skip", while usually there would be conflict when applying patch that is already present some deeper.

I think that is a bug in git-rebase.

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git