I find git-absorb very useful and it can mostly replace manual commit --fixup.

https://github.com/tummychow/git-absorb