So here is a semi-failed attempt to fix the issue I encountered earlier, cf. https://lore.kernel.org/git/xmqq8s6tcuxc.fsf@gitster.g/ where "git rebase" carries forward notes attached to the commits in the original history to their equivalents in the rewritten history, but "git rebase -x cmd" does not when cmd modifies the given HEAD commit. Junio C Hamano (2): sequencer.c: make commit_post_rewrite() take two object names [WIP] sequencer.c: carry forward notes on HEAD across "rebase -x" builtin/commit.c | 6 +++--- sequencer.c | 19 +++++++++++++------ sequencer.h | 2 +- t/t3404-rebase-interactive.sh | 18 ++++++++++++++++++ 4 files changed, 35 insertions(+), 10 deletions(-) -- 2.31.0-rc2-175-g3820f1c72e