Hallo Bj=C3=B6rn,

Bj=C3=B6rn Steinbrink schrieb am Sat 22. Mar, 02:52 (+0100):
quoted text
> On 2008.03.22 02:19:42 +0100, J=C3=B6rg Sommer wrote:
> > The current version of git-rebase--interactive shows the user the commi=
ts
quoted text
> > 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. 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 commi=
ts
quoted text
> > and might lead to mistakes.
>=20
> Uhm, why do you completely remove the possibility to edit A

Ahh, now I see what you've tried to say. I did add the option
--first-parent for rebase interactive *without* preserve merges, too.
I'll update my patch.

Bye, J=C3=B6rg.
--=20
=E2=80=9CScience is the game we play with God to find out what his rules ar=
e.=E2=80=9D