Since we started to use a branching model to control every stuff we send to production, we use the interactive rebase into a temp branch in order choose commits, keep their reference and check the code before check it to the stable branch.

gistfile1.txt

git checkout master
git checkout -b temp
git rebase -i stable

# Time to select/remove/squash commits

git checkout stable
git pull . temp
git branch -d temp

# And now you can push to production :)