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

Re: Prompt for merge message?

From
Andreas Krey <a.krey@gmx.de>
Date
Oct 6, 2011, 20:19 UTC
Message-ID
<20111006201907.GA27744@inner.h.iocl.org>
In-Reply-To
<20111006182534.GA13628@vfa-6h>
On Thu, 06 Oct 2011 11:25:34 +0000, Jacob Helwig wrote:
> "git merge --no-ff --no-commit branch_foo && git commit" ?
"git merge --no-ff branch_foo && git commit --amend"
Andreas
Previous: Stephen BashNext: Junio C Hamano
Message 5 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.