{"thread":{"id":"64051","subject":"Difference between 'git rebase --continue' and 'git commit' during rebase conflict resolution","startedAt":"2025-08-28T10:01:32Z","lastAt":"2025-08-28T10:01:32Z","messageCount":1,"participants":["Stephen Finucane"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"525097","messageId":"53396d8a6c08c7045d0f381a10db8b3058565ecb.camel@that.guru","threadId":"64051","inReplyTo":null,"subject":"Difference between 'git rebase --continue' and 'git commit' during rebase conflict resolution","fromName":"Stephen Finucane","fromEmail":"stephen@that.guru","sentAt":"2025-08-28T09:56:17Z","receivedAt":"2025-08-28T10:01:32Z","isPatch":false,"sender":{"key":"stephen@that.guru","avatar":"https://gravatar.com/avatar/2f9716975d743b6d7764972ed20fecdad956a5d4e3e6cfe8282d10151f1b2df0?d=mp&s=160"},"body":"o/\n\nPer $subject, I've noticed that when resolving conflicts during a\nrebase, I get different behaviour depending on whether I use 'git\nrebase --continue' or 'git commit' (followed by 'git rebase --continue'\n[*]). In the former case, both the authorship metadata and the commit\nmessage are preserved. In the latter case, only the commit message is\npreserved. This can inadvertently result in you stripping authorship\nmetadata and not noticing because the commit message is unchanged.\n\nIs this by design or just \"how it has to be\" because e.g. the\nauthorship metadata is not available to be pre-populated in the commit\nwhen doing the latter. If neither, is this something that could be\nchanged at some point, either by preserving the metadata or preventing\n'git commit' usage if a rebase conflict resolution state?\n\nCheers,\nStephen\n\n[*] I'm not doing this intentionally. Rather, it's muscle memory from\nmerge conflict resolution 😅️\n"}]}