From: Stephen Bash <bash@genarts.com>
Date: Thu, 06 Oct 2011 20:15:38 GMT
Subject: Re: Prompt for merge message?
Message-ID: <21983420.46542.1317932138649.JavaMail.root@mail.hq.genarts.com>
In-Reply-To: <201110061851.p96Ipfui016139@no.baka.org>

----- Original Message -----
> From: in-gitvger@baka.org
> Sent: Thursday, October 6, 2011 2:51:41 PM
> Subject: Re: Prompt for merge message?
>
> In message <20111006182534.GA13628@vfa-6h>, Jacob Helwig writes:
> 
> 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.
> 
> "git merge --no-ff --no-commit branch_foo && git commit" ?
> 
> While not ideal, you can use a multi-line message on the command line.
> I do it all of the time. Popping up an editor like in the separated
> workflow is more user friendly.
> 
> ----------------------------------------------------------------------
> git merge --no-ff -m "My feature is very complex
> 
> It requires multiple lines to explain.
> 
> Or perhaps I am too verbose." branch_foo
> ----------------------------------------------------------------------

And not so helpful if you want to use the --log option to pre-populate the merge message (which I often run into).

Thanks,
Stephen