Hi Johannes
On 01/04/2025 17:22, Johannes Schindelin wrote:
Hi Philippe,
On Fri, 28 Mar 2025, Philippe Blain via GitGitGadget wrote:
From: Philippe Blain <levraiphilippeblain@xxxxxxxxx>
Since 982288e9bd (status: rebase and merge can be in progress at the
same time, 2018-11-12), when a merge is in progress as part of a 'git
rebase -r' operation, 'wt_longstatus_print_state' shows information
about the in-progress rebase (via show_rebase_information), and then
calls 'show_merge_in_progress' to help the user conclude the merge. This
function suggests using 'git commit' to do so, but this throws away the
authorship information from the original merge, which is not ideal.
It is unfortunate that we cannot fix this, as `git commit` with an
interrupted `pick` _would_ retain authorship, right?
Unfortunately not. Running "git commit" rather than "git rebase
--continue" to commit a conflict resolution when rebasing always loses
the authorship.
Best Wishes
Phillip
(Why is that so? Can
we really not use the same trick with `merge`s?)
Ciao,
Johannes
