I have a similar workflow, but make a bunch of commits with "git commit --fixup HEAD". (Or --squash REF). Then on the final rebase the commits are automaticall

I have a similar workflow, but make a bunch of commits with "git commit --fixup HEAD". (Or --squash REF). Then on the final rebase the commits are automatically ordered with s and f as appropriate. Although I do a fair bit of amending, too.