From: Jörg Sommer <joerg@alea.gnuu.de>
Date: Mon, 21 Apr 2008 00:17:26 GMT
Subject: Re: [PATCH v2 02/13] Don't append default merge message to -m message
Message-ID: <20080421001726.GA13639@alea.gnuu.de>
In-Reply-To: <7v7iescvu7.fsf@gitster.siamese.dyndns.org>

Hello Junio,

Junio C Hamano schrieb am Sun 20. Apr, 09:52 (-0700):
> Jörg Sommer <joerg@alea.gnuu.de> writes:
> 
> > From: gitster@pobox.com (Junio C Hamano)
> > Date: Sun, 23 Mar 2008 22:17:09 -0700
> >
> > Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
> 
> 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)