git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Prompt for merge message?

From
SBStephen Bash <bash@genarts.com>
Date
Oct 6, 2011, 20:15 UTC
Message-ID
<21983420.46542.1317932138649.JavaMail.root@mail.hq.genarts.com>
In-Reply-To
<201110061851.p96Ipfui016139@no.baka.org>
----- Original Message -----
Show 30 quoted lines
> 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

Previous: in-gitvger@baka.orgNext: Andreas Krey
Message 4 of 10 in “Prompt for merge message?”
  1. Todd A. JacobsOct 6, 2011
  2. Jacob HelwigOct 6, 2011
  3. in-gitvger@baka.orgOct 6, 2011
  4. Stephen BashOct 6, 2011
  5. Andreas KreyOct 6, 2011
  6. Junio C HamanoOct 6, 2011
  7. Shawn PearceOct 6, 2011
  8. Junio C HamanoOct 6, 2011
  9. Todd A. JacobsOct 7, 2011
  10. Junio C HamanoOct 7, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.