Once you learn how to use `git rebase -i` it makes the above things trivial to do! I didn't know about it for a while, but that's my most often used command to fix up my commits.