From: Jörg Sommer <joerg@alea.gnuu.de>
Date: Sat, 22 Mar 2008 09:43:31 GMT
Subject: Re: [PATCH] rebase with preserve merges should not show merged commits
Message-ID: <20080322094331.GB30074@alea.gnuu.de>
In-Reply-To: <alpine.LSU.1.00.0803220231020.4124@racer.site>

Hallo,

Johannes Schindelin schrieb am Sat 22. Mar, 02:33 (+0100):
> On Sat, 22 Mar 2008, Jörg Sommer wrote:
> 
> > The current version of git-rebase--interactive shows the user the 
> > commits coming from a merge.
> > 
> > M---A---B
> >  \       \
> >   o---o---+---o branch
> > 
> > Rebasing branch on M with preserve merges gives the commits A and B. But 
> > if you mark them for editing or remove them the rebase fails. You must 
> > keep them as they are. It's useless to bother the user with these 
> > commits and might lead to mistakes.
> 
> I don't understand.  Rebasing with "rebase --onto <something else> M" 
> _should_ show A and B.

But IMO not “rebase --onto <something else> --preserve-merges -i M”.

Schöne Grüße, Jörg.
-- 
Geld allein macht nicht glücklich, aber es ist besser in einem Taxi zu
weinen, als in der Straßenbahn.
	       	   	       			(Marcel Reich‐Ranicki)