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

Why does "merge --continue" expect no arguments?

From
Daniel Vicarel <shundra8820@gmail.com>
Date
Dec 21, 2021, 14:50 UTC
Message-ID
<CALRdAfcyfesNqfLhhe2GW_5V9s2hf++i6mZS1Lw5hqQYTca85w@mail.gmail.com>

There are several git commands that take a "--continue" option...`merge`, `rebase`, `cherry-pick`, etc. From looking through the source though, only `merge --continue` seems to expect no other arguments. Suppose that you have just resolved some merge conflicts, and then want to run `git merge --continue --no-edit` to accept the default merge commit message. Having to open/close the configured text editor still is mildly annoying. I'm interested in submitting a patch to "fix" this `merge` behavior, but I wanted to check if this was really the intended behavior first, and if so why.

Thanks, Dan Vicarel (he/him)

Next: Junio C Hamano
Message 1 of 12 in “Why does "merge --continue" expect no arguments?”
  1. Daniel VicarelDec 21, 2021
  2. Junio C HamanoDec 21, 2021
  3. Daniel VicarelDec 21, 2021
  4. Daniel VicarelDec 21, 2021
  5. Junio C HamanoDec 22, 2021
  6. Philip OakleyDec 21, 2021
  7. Ævar Arnfjörð BjarmasonDec 24, 2021
  8. Junio C HamanoDec 25, 2021
  9. Ævar Arnfjörð BjarmasonDec 26, 2021
  10. Junio C HamanoDec 27, 2021
  11. Daniel VicarelDec 23, 2021
  12. Junio C HamanoDec 23, 2021

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.