Re: Heads up: major rebase -i -p rework coming up

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 25, 2009, 20:59 UTC
Message-ID: <alpine.DEB.1.00.0901252157090.14855@racer>
In-Reply-To: <7vwscjceec.fsf@gitster.siamese.dyndns.org>

Hi,

On Sun, 25 Jan 2009, Junio C Hamano wrote:

Show 10 quoted lines

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > So maybe I answered my question myself:
> >
> > 	merge parents $sha1 [$sha1...] original $sha1 $msg
> 
> When you are reparenting, how would original commit get in the picture?
> You wouldn't want the resulting merge to claim it merged X (which would be
> what's in original's commit log) when in fact it now merged Y because the
> user reparented it, would you?

Oh yes, I would!  Example:

	A - B - C
	  /
	X - Y

If I merged X into B by accident, but actually meant to merge Y, then C' should still come after B', no?

Ciao, Dscho