Hallo,

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

But IMO not =E2=80=9Crebase --onto <something else> --preserve-merges -i M=
=E2=80=9D.

Sch=C3=B6ne Gr=C3=BC=C3=9Fe, J=C3=B6rg.
--=20
Geld allein macht nicht gl=C3=BCcklich, aber es ist besser in einem Taxi zu
weinen, als in der Stra=C3=9Fenbahn.
	       	   	       			(Marcel Reich=E2=80=90Ranicki)