Re: [PATCH] rebase with preserve merges should not show merged commits
Hallo,
Johannes Schindelin schrieb am Sat 22. Mar, 02:33 (+0100):
Show 16 quoted lines
> 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)