Re: rebase -p confusion in 1.6.1

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Jan 15, 2009, 14:14 UTC
Message-ID: <496F44AC.2060607@drmicha.warpmail.net>
In-Reply-To: <20090115135518.GB10045@leksak.fem-net>

Stephan Beyer venit, vidit, dixit 15.01.2009 14:55:

Show 8 quoted lines

> Hi,
> 
>> First of all: git 1.6.0.6 gives you the unchanged graph after using
>> rebase -i -p.
> 
> This is true and it is a far better behavior than now, but I think it's
> not the expected behavior. (I have written about the behavior I'd expect
> in another reply to the original mail.)

Yep, I think -p should preserve only merges in side branches (and therefore produce what you suggest, and what you get without -p). If it preserves all merges then there is nothing to rewrite here.

BTW: How does the sequencer based rebase do in this case, and what's the
general status? If it's about to be integrated we can do without the
present script...

Michael