@b0rk
That there is a command 'git rebase -i --autosquash' which you can combine with 'git commit --fixup' to do pretty effing advanced history editing.

I only learned about that after more than a decade of using git. Thanks Stefano!