From: Stephan Beyer <s-beyer@gmx.net>
Date: Tue, 07 Oct 2008 12:07:00 GMT
Subject: Re: [PATCH RFC] rebase--interactive: if preserving merges, use first-parent to limit what is shown.
Message-ID: <20081007120700.GC7209@leksak.fem-net>
In-Reply-To: <48EB32A4.80809@redhat.com>

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

Regards,
  Stephan

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F