Rebasing http://nathanleclaire.com/blog/2014/09/14/dont-be-scared-of-git-rebase/ Squashing http://eli.thegreenplace.net/2014/02/19/squashing-github-pull-requests-into-a-single-commit