a workflow that allows me to squash my commits before merging to master / this depends on master not having moved since

git squash workflow

combination of: 
http://stackoverflow.com/questions/363908/how-do-i-use-git-rebase-i-to-rebase-all-changes-in-a-branch
http://stackoverflow.com/questions/5189560/how-can-i-squash-my-last-x-commits-together-using-git

git merge-base feature master
git reset --hard output of above sha
git merge --squash HEAD@{1}
git commit