Re: rebase -p confusion in 1.6.1

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 15, 2009, 14:25 UTC
Message-ID: <alpine.DEB.1.00.0901151518520.3586@pacific.mpi-cbg.de>
In-Reply-To: <496F44AC.2060607@drmicha.warpmail.net>

Hi,

On Thu, 15 Jan 2009, Michael J Gruber wrote:

Show 10 quoted lines

> Stephan Beyer venit, vidit, dixit 15.01.2009 14:55:
> 
> >> 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

you mean everything in master..work?

> (and therefore produce what you suggest, and what you get without -p). 
> If it preserves all merges then there is nothing to rewrite here.

The merge _is_ outside of master, so I do not understand what the heck you are talking about.

The more I think about it, I think it's possible I broke it with the introduction of the "noop".

However, there could be a _different_ test case where the current -p handling shows the same error. Dunno.

Ciao, Dscho