From: Jakub Narebski <jnareb@gmail.com>
Date: Sun, 25 Jan 2009 13:46:02 GMT
Subject: Re: Heads up: major rebase -i -p rework coming up
Message-ID: <glhqdi$tec$1@ger.gmane.org>
In-Reply-To: <alpine.DEB.1.00.0901250324320.14855@racer>

Johannes Schindelin wrote:

>> Hmm.  You're right, that is not really intuitive.  How about
>> 
>>       merge (B) A # Merge...
>> 
>> instead?
> 
> Or even better:
> 
>         merge B parent A' # Merge...

merge B with A' # Merge... 

;-)

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git