From: Andrew Wong <andrew.w@sohovfx.com>
Date: Tue, 17 May 2011 00:33:59 GMT
Subject: Re: [BUG] rebase -p loses commits
Message-ID: <4DD1C277.9070605@sohovfx.com>
In-Reply-To: <7vfwoel6vw.fsf@alter.siamese.dyndns.org>

On 05/16/2011 04:36 PM, Junio C Hamano wrote:
>     F---*  feature
>    /   /
>   B---M    master
>
> But what does it mean to rebase that on top of master, preserving merges
> in the first place? You are already on top of 'master' and '*' itself
> should be what you should get, no?  IOW, shouldn't you already be
> up-to-date?
>    
Since preserve-merge uses the interactive-rebase, I think 
interactive-rebase should still pick the merge commit, which will then 
be consistent with what's happening if we rebase onto "F". So, without 
knowing whether "F" or "M" is the first-parent, I think 
interactive-rebase onto "F" and onto "M" should have the same effect. 
i.e. interactive-rebase picks the merge commit