Squash commits using interactive rebase
# first make a new branch off the current branch git rebase -i master