Fix squashed diffs and allow for new commits to be added.

We weren't producing accurate squashed diffs - they were not including
the very last commit. That's been fixed.

We also fixed a bug that prevented us from re-pushing with new commits
on top of previous ones.
Adding playful snark.