From: Avi Kivity <avi@redhat.com>
Date: Tue, 07 Oct 2008 12:22:26 GMT
Subject: Re: [PATCH RFC] rebase--interactive: if preserving merges, use first-parent to limit what is shown.
Message-ID: <48EB5482.7050207@redhat.com>
In-Reply-To: <20081007120700.GC7209@leksak.fem-net>

Stephan Beyer wrote:
> Hi,
>
> Avi Kivity wrote:
>   
>> 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.
>>     
>
> git-sequencer has a "merge" command for that. I'm really sorry that this has
> not been sent to the list yet. Nevertheless I'm always glad to find testers
> for sequencer, so if you like, fetch
> 	git://repo.or.cz/git/sbeyer.git seq-builtin-dev
>
>   

But this isn't a merge; it's more of a 'pick into this branch' instead.

Maybe 'merge' can do this, but we also need to populate the todo with 
the required information (otherwise, git rebase -i without changes to 
the todo file will not be a no-op).


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