Hello Junio,
Junio C Hamano schrieb am Sun 20. Apr, 09:52 (-0700):
> Jörg Sommer <joerg@xxxxxxxxxxxx> writes:
>
> > From: gitster@xxxxxxxxx (Junio C Hamano)
> > Date: Sun, 23 Mar 2008 22:17:09 -0700
> >
> > Signed-off-by: Jörg Sommer <joerg@xxxxxxxxxxxx>
>
> I'd admit that this was taken from my "You could do this" patch, and I am
> inclined to think that the users would probably want this behaviour of
> dropping the default merge summary when giving their own message with -m,
> but I am not absolutely convinced that doing this unconditionally is the
> right thing to do (iow, some people might have relied on the current
> behaviour).
>
> List, any objections?
What about a new option -M? But I doubt someone expects this behaviour
because the manpage says:
The second syntax (<msg> HEAD <remote>) is supported for historical
reasons. Do not use it from the command line or in new scripts. It is
the same as git merge -m <msg> <remote>.
^^^^ ^^
Currently, it's not the same, but someone might expect it.
Bye, Jörg.
--
Die Erde ist das einzigste Irrenhaus, das von seinen eigenen Insassen
verwaltet wird.
(U. Schmidt)
Attachment:
signature.asc
Description: Digital signature http://en.wikipedia.org/wiki/OpenPGP
