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

Re: Prompt for merge message?

From
Jacob Helwig <jacob@technosorcery.net>
Date
Oct 6, 2011, 18:25 UTC
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:
Show 13 quoted lines
> 
> 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
Previous: Todd A. JacobsNext: in-gitvger@baka.org
Message 2 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.