Hallo Bj=F6rn,

Bj=F6rn Steinbrink schrieb am Sat 22. Mar, 02:52 (+0100):
quoted text
> On 2008.03.22 02:19:42 +0100, J=F6rg 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 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=F6rg.
--=20
Viele Leute glauben, dass sie denken, wenn sie lediglich
ihre Vorurteile neu ordnen.