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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 😅️





[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux