Re: rebase -p confusion in 1.6.1

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 15, 2009, 16:53 UTC
Message-ID: <alpine.DEB.1.00.0901151751580.3586@pacific.mpi-cbg.de>
In-Reply-To: <slrngmuoq8.3u2.sitaramc@sitaramc.homelinux.net>

Hi,

if you would like me to respond to your questions in the future, it is mandatory to keep me in the Cc: list.

On Thu, 15 Jan 2009, Sitaram Chamarty wrote:

Show 16 quoted lines

> On 2009-01-15, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> 
> > The intention was this:
> >
> > 	$ git rebase -p master
> >
> > would need to rewrite _all_ commits that are in "master..".  All of them, 
> > including the merge commits.
> 
> I went hog wild with all sorts of test cases and my head is
> spinning, but -- even when things happen more predictably,
> I'm unable to make "rebase -p" carry an evil merge over.
> The "evil" part stays behind.
> 
> I'm not sure if that is intentional or not, or (more likely)
> my brain has become addled and I missed something somewhere.

Yes, this is intentional.

	Instead of ignoring merges, try to recreate them.

That means it tries to recreate them. Not that it is successful. And not even that it realizes when it failed.

Hth, Dscho