From: Avi Kivity <avi@redhat.com>
Date: Tue, 07 Oct 2008 09:57:56 GMT
Subject: Re: [PATCH RFC] rebase--interactive: if preserving merges, use first-parent to limit what is shown.
Message-ID: <48EB32A4.80809@redhat.com>
In-Reply-To: <20081006212021.04ba9214.stephen@exigencecorp.com>

Stephen Haberman wrote:
> However, t3404 makes a good point that if the right hand of the merge
> has parents that are going to get rebased, the right hand side does
> need to be included/shown/rewritten.
>
>   

But, won't those commits get linearized?  Won't git rebase pick the 
commits into the left-hand side of the merge instead of into the right 
hand side?

If git rebase is to handle nonlinear history, it needs much more 
expressive commands; not only saying which commit to pick, but also what 
the commit's parents shall be.

-- 
error compiling committee.c: too many arguments to function