If you use `git commit --fixup=<commit>`, then the new commit will be automatically moved, and given the "fixup" action when doing an interactive rebase. (Same for --squash).
This means you only need to match the fixups to commits once, when you're initially creating them.