Hallo Junio,

Junio C Hamano schrieb am Mon 24. Mar, 09:45 (-0700):
quoted text
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> > On Sun, 23 Mar 2008, Junio C Hamano wrote:
> >
> >> I unfortunately do not recall why _prepend_, and not _replace_, had to=
 be
quoted text
> >> the right behaviour.
> >
> > http://article.gmane.org/gmane.comp.version-control.git/31896/match=3Dg=
it+merge+make+usable
quoted text
> >
> > Hth,
>=20
> Ok, it helped.
>=20
> So it was "my suspicion that people who would want to pass -m would want
> it to behave this way".
>=20
> I do not care deeply either way myself, as I never have found use for -m
> to the merge command, but I think it could have been argued either way.

I would like to argue for the replace way. :) Take git rebase -p as an
example. If a merge is included in the rebase, it's redone with git merge
-m. Because git rebase works with detached heads you get merge messages
like this:

commit 580c95c6bb4bb74bdbf6776ca816560690c16c5d
Merge: 62b68ef... 9604163...
Author: A U Thor <author@example.com>
Date:   Thu Apr 7 15:26:13 2005 -0700

    Merge branch 'to-be-preserved' into to-be-rebased
   =20
    Merge commit '96041635cd9e0bd999384c1c30d7df40002a0742' into HEAD

This is an example from the test t3404. Simply run git log -g and search
for merges.

Maybe a new option -M for merge could help? -m with the old behaviour to
prepend and -M to replace.

Bye, J=F6rg.
--=20
IRC: Der [Prof. Andreas Pfitzmann, TU Dresden] hat gerade vorgeschlagen, sie
  sollen doch statt Trojanern die elektromagnetische Abstrahlung nutzen. Das
  sei nicht massenf=E4hig, ginge ohne Eingriff ins System, sei zielgerichte=
t,
  und, der Hammer, das funktioniere ja bei Wahlcomputern schon sehr gut.