From: Jacob Helwig <jacob@technosorcery.net>
Date: Thu, 06 Oct 2011 18:25:34 GMT
Subject: Re: Prompt for merge message?
Message-ID: <20111006182534.GA13628@vfa-6h>
In-Reply-To: <6eb7acc7-f4be-4b90-a2fa-a0c91ed9a5a8@t11g2000yqk.googlegroups.com>

On Thu, 06 Oct 2011 10:49:02 -0700, Todd A. Jacobs wrote:
> 
> 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. However, it's a little annoying to
> have to always write the commit message on the command-line,
> especially in cases where a more expository multi-line message would
> be useful.
> 
> 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?

"git merge --no-ff --no-commit branch_foo && git commit" ?

Though it would be handy to have a "stop and let me edit the merge
commit message" flag on git merge itself.

-- 
Jacob Helwig
http://about.me/jhelwig