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

Re: [PATCH] status: suggest `git merge --continue`, not `git commit`

From
Julia Evans <julia@jvns.ca>
Date
Oct 9, 2026, 13:05 UTC
Message-ID
<2423115b-aed4-4af3-a200-15939824d1b5@app.fastmail.com>
In-Reply-To
<3a716db0-4c40-4407-9237-f83c0dd37ad8@gmail.com>
Show 11 quoted lines
>> During a merge conflict, we suggest using --continue to continue the
>> merge for rebase, revert, and cherry-pick.
>> 
>> Change the `git merge` advice to be consistent.
>> Commit 367ff694281ce569edd8f6e444fc770f92f5d215 says that
>
> When we use the output of "git show -s --format=reference" when 
> referring to previous commits, so this would be
>
> 367ff69428 (merge: add '--continue' option as a synonym for 'git 
> commit', 2016-12-14)
Thanks, will fix in v2.
Show 12 quoted lines
>> `git merge --continue` is intended to be a synonym for `git commit`,
>> and the `git merge` man page already suggests to use
>> `git merge --continue`.
>
> This looks like a sensible improvement. I wonder if we should fix the 
> grammar at the same time so it says
>
>      (use "git merge --continue" to conclude the merge)
>
> rather than
>
>      (use "git merge --continue" to conclude merge)
Makes sense to me, will change that too.
Previous: Phillip WoodNext: Junio C Hamano
Message 3 of 11 in “status: suggest `git merge --continue`, not `git commit`”
  1. status: suggest `git merge --continue`, not `git commit`Julia Evans via GitGitGadget, Oct 6, 2026
  2. Phillip WoodOct 6, 2026
  3. Julia EvansOct 9, 2026
  4. Junio C HamanoOct 6, 2026
  5. Julia EvansOct 9, 2026
  6. status: suggest `git merge --continue`, not `git commit`Julia Evans via GitGitGadget, Oct 9, 2026
  7. Kristoffer HaugsbakkOct 9, 2026
  8. Julia EvansOct 9, 2026
  9. status: suggest `git merge --continue`, not `git commit`Julia Evans via GitGitGadget, Oct 9, 2026
  10. Phillip WoodOct 9, 2026
  11. Junio C HamanoOct 9, 2026

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.