Simple commit-squashing

If you had a lot of merge-conflicts and (as I) forgot to enable rerere, do like this:

$ git log
$ git checkout -b my_squash
$ git reset --soft <commit before your squashables>
$ git commit