[Git Tricks for Clean Histories](http://blog.ssokolow.com/archives/2011/01/21/git-tricks-for-clean-histories/)