I just use `git commit --amend` and then there is nothing to squash.