git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stephan Beyer <s-beyer@gmx.net>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: 'next' will be rewound shortly
Date: Fri, 27 Jun 2008 19:19:48 +0200	[thread overview]
Message-ID: <20080627171948.GC6201@leksak.fem-net> (raw)
In-Reply-To: <20080627163411.GA2058@genesis.frugalware.org>

[-- Attachment #1: Type: text/plain, Size: 1015 bytes --]

Hi,

I just looked how you solved that and wanted to start a discussion but
you've swooped in first, find. ;-)

> I think it its current form that is not a bugfix. The user may want to
> prepend a custom message and may want to replace the original message
> with a custom one, and I would not consider either of them as "buggy".

Well, when I do -m <msg>, I expect that my commit message is exactly
<msg>, and not <msg> with appended stuff.
Of course, it doesn't matter what I expect, but I think what the
documentation says matters.
This is (in "master" and in "builtin-merge" of vmiklos.git):

-m <msg>::
	The commit message to be used for the merge commit (in case
	it is created). The `git-fmt-merge-msg` script can be used
	to give a good default for automated `git-merge` invocations.

So it is not mentioned that a standard message is appended, and thus the
original behavior is somehow "buggy" :)

Regards,
  Stephan

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

  reply	other threads:[~2008-06-27 17:20 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-18 23:24 [ANNOUNCE] GIT 1.5.6 Junio C Hamano
2008-06-19  7:24 ` A note from the maintainer Junio C Hamano
2008-06-19  9:17   ` 'next' will be rewound shortly Junio C Hamano
2008-06-27 16:12     ` Stephan Beyer
2008-06-27 16:34       ` Miklos Vajna
2008-06-27 17:19         ` Stephan Beyer [this message]
2008-06-27 19:28           ` Miklos Vajna
2008-06-27 21:28             ` Junio C Hamano
2008-06-27 21:36               ` Miklos Vajna
2008-06-27 23:41                 ` Stephan Beyer
2008-06-28  0:05                 ` Junio C Hamano
2008-07-14  5:51   ` A note from the maintainer Junio C Hamano
2008-06-22 16:54 ` [ANNOUNCE] GIT 1.5.6 Steffen Prohaska
2008-06-26  6:21 ` [ANNOUNCE] GIT 1.5.6.1 Junio C Hamano
2008-07-01 11:29   ` Steffen Prohaska

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080627171948.GC6201@leksak.fem-net \
    --to=s-beyer@gmx.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=vmiklos@frugalware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).