Re: [PATCH] rebase with preserve merges should not show merged commits

From: Jörg Sommer <joerg@alea.gnuu.de>
Date: Mar 22, 2008, 09:40 UTC
Message-ID: <20080322094051.GA30074@alea.gnuu.de>
In-Reply-To: <20080322015252.GA7570@atjola.homenet>

Hallo Björn,

Björn Steinbrink schrieb am Sat 22. Mar, 02:52 (+0100):

Show 15 quoted lines

> On 2008.03.22 02:19:42 +0100, 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.
> 
> Uhm, why do you completely remove the possibility to edit A instead of
> fixing the code so that the editing actually works?

Because I didn't see why it's useful to edit A and create A' and merge in A again, later.

M---A---B
 \       \
  C---D---+---o branch

M---A--------------B
 \                  \
  C---B'---D'---A'---+---o branch

Bye, Jörg.

-- 
Viele Leute glauben, dass sie denken, wenn sie lediglich
ihre Vorurteile neu ordnen.