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

Difference between 'git rebase --continue' and 'git commit' during rebase conflict resolution

From
Stephen Finucane <stephen@that.guru>
Date
Aug 28, 2025, 09:56 UTC
Message-ID
<53396d8a6c08c7045d0f381a10db8b3058565ecb.camel@that.guru>
o/

Per $subject, I've noticed that when resolving conflicts during a rebase, I get different behaviour depending on whether I use 'git rebase --continue' or 'git commit' (followed by 'git rebase --continue' [*]). In the former case, both the authorship metadata and the commit message are preserved. In the latter case, only the commit message is preserved. This can inadvertently result in you stripping authorship metadata and not noticing because the commit message is unchanged.

Is this by design or just "how it has to be" because e.g. the authorship metadata is not available to be pre-populated in the commit when doing the latter. If neither, is this something that could be changed at some point, either by preserving the metadata or preventing 'git commit' usage if a rebase conflict resolution state?

Cheers, Stephen

[*] I'm not doing this intentionally. Rather, it's muscle memory from merge conflict resolution 😅️

Message 1 of 1 in “Difference between 'git rebase --continue' and 'git commit' during rebase conflict resolution”
  1. Stephen FinucaneAug 28, 2025

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.