Re: [RFC] Replace rebase with filtering

From: Steven Grimm <koreth@midwinter.com>
Date: Jan 16, 2007, 20:40 UTC
Message-ID: <45AD383E.50105@midwinter.com>
In-Reply-To: <Pine.LNX.4.63.0701162131130.22628@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin wrote:

Show 11 quoted lines

> That is correct, but --ignore-if-in-upstream actually tests the hash of 
> the _diff_, not of the commit. So, if c really introduces the same change 
> as f (i.e. the diffs are identical), git-rebase will ignore f:
>
> a---b---c---d
>              \
>               e'---g'
>
> Totally untested, of course. But this is what --ignore-if-in-upstream was 
> written for.
>

Okay, great, that is certainly an improvement over what I thought was happening. But it won't work if you had to manually resolve a conflict during the rebase, yes? In that case the diffs would presumably not match.

-Steve