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

Re: auto commit merge using the default merge message

From
Alex Riesen <raa.lkml@gmail.com>
Date
Apr 23, 2009, 07:57 UTC
Message-ID
<81b0412b0904230057k1653d039vfc3962e6affda584@mail.gmail.com>
In-Reply-To
<81bfc67a0904230046j48ed06b7s5693406332ee52dc@mail.gmail.com>
2009/4/23 Caleb Cushing <xenoterracide@gmail.com>:
Show 6 quoted lines
> so I do the same merge all the time... sorta, I'm not sure rerere
> would actually work because the file is different each time... I just
> have to delete it each time. and I want to automate the process.
> checkout merge rm commmit, problem is commit brings and editor up, I
> want to commit with the 'auto inserted merge message' that is
> generated, without seeing the editor, how do I do this?

See git commit -C <commit-with-fitting-description>, git commit -F <message-file> and git commit -m "message text".

Previous: Caleb CushingNext: Michael J Gruber
Message 2 of 10 in “auto commit merge using the default merge message”
  1. Caleb CushingApr 23, 2009
  2. Alex RiesenApr 23, 2009
  3. Michael J GruberApr 23, 2009
  4. Junio C HamanoApr 23, 2009
  5. Michael J GruberApr 23, 2009
  6. Brian GernhardtApr 23, 2009
  7. Caleb CushingApr 24, 2009
  8. Jeff KingApr 24, 2009
  9. Caleb CushingApr 24, 2009
  10. Jeff KingApr 24, 2009

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.