How can I squash my last X commits together into one commit using Git?
What can be really convenient: Find the commit hash you want to squash on top of, say d43e15.
d43e15
Now use
git reset d43e15 git commit -am 'new commit name'