From: Stephan Beyer <s-beyer@gmx.net>
Date: Wed, 30 Jul 2008 12:18:10 GMT
Subject: Re: [PATCH 5/5] Migrate rebase-i to sequencer
Message-ID: <20080730121810.GC8767@leksak.fem-net>
In-Reply-To: <alpine.DEB.1.00.0807261652050.26810@eeepc-johanness>

Hi,

Johannes Schindelin wrote:
> Hi,
> 
> On Sat, 26 Jul 2008, Stephan Beyer wrote:
> 
> > For git-rebase-i -p (preserving merges) merges should be
> > rewritten. For this, the sequencer instructions "mark", "merge"
> > and "reset" are used.
> 
> Ah, the ugliness returns.

Yet I have not seen a way that is as flexible and clean as using
mark/merge/reset and imho this is not ugly.
(I know the discussion of the Joerg Sommer patches that introduced mark,
merge and reset.)

Regards.

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