Re: [PATCH 3/3] wt-status: suggest 'git rebase --continue' to conclude 'merge' instruction
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Apr 1, 2025, 16:22 UTC
- Message-ID
- <0bd7e0c1-fe73-9e16-0737-d6b175a60dd3@gmx.de>
- In-Reply-To
- <db01acdd062a17b1cca62428eba8c3ed62ca7c6a.1743181401.git.gitgitgadget@gmail.com>
Hi Philippe,
On Fri, 28 Mar 2025, Philippe Blain via GitGitGadget wrote:
Show 9 quoted lines
> From: Philippe Blain <levraiphilippeblain@gmail.com> > > 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? (Why is that so? Can we really not use the same trick with `merge`s?)
Ciao, Johannes