How can I squash my last X commits together into one commit using Git?
git rebase -i HEAD^^
where the number of ^'s is X
(in this case, squash the two last commits)