Note that, since the 2.55.0 release this June, git offers "instant fixup" as "git history fixup <SHA>"

https://git-scm.com/docs/git-history