From: Junio C Hamano <gitster@pobox.com>
To: "Todd A. Jacobs" <nospam+listmail@codegnome.org>
Cc: git@vger.kernel.org
Subject: Re: Prompt for merge message?
Date: Thu, 06 Oct 2011 15:02:38 -0700 [thread overview]
Message-ID: <7vsjn5ye0x.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <6eb7acc7-f4be-4b90-a2fa-a0c91ed9a5a8@t11g2000yqk.googlegroups.com> (Todd A. Jacobs's message of "Thu, 6 Oct 2011 10:49:02 -0700 (PDT)")
"Todd A. Jacobs" <nospam+listmail@codegnome.org> writes:
> I often find myself using "--no-ff -m foo" for merging short-lived
> branches, because the merge commit usually needs to say something
> about having finished a feature rather than referring to a branch that
> will be deleted shortly anyway....
> ... Is there currently a way to get git to prompt for the merge message,
> rather than using the default or requiring the -m flag? If not, isn't
> this a common-enough use case to have that ability added to the merge
> function?
Others commented on the current practices and gave their own useful tips
already, but an additional hint is to name your branch more sensibly, so
that you do not feel it is useless to record it in the history.
As to a real longer-term solution, I wouldn't mind a patch that teaches
"git merge" an "-e" option just like "git commit" has.
$ git commit -m "Finish frotz feature" -e -a
... editor opens with the first line filled already here ...
is something I find myself using fairly often.
Thanks.
[offtopic: It is annoying that my MUA warns me
"nospam+listmail@domain" may be bogus; do you really want to send?
Could you do something about it please?]
next prev parent reply other threads:[~2011-10-06 22:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-06 17:49 Prompt for merge message? Todd A. Jacobs
2011-10-06 18:25 ` Jacob Helwig
2011-10-06 18:51 ` in-gitvger
2011-10-06 20:15 ` Stephen Bash
2011-10-06 20:19 ` Andreas Krey
2011-10-06 22:02 ` Junio C Hamano [this message]
2011-10-06 22:09 ` Shawn Pearce
2011-10-06 23:17 ` Junio C Hamano
2011-10-07 1:15 ` Todd A. Jacobs
2011-10-07 3:07 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vsjn5ye0x.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=nospam+listmail@codegnome.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.
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 NNTP newsgroup(s).