Great post. Calls attention to the importance of having clean, stable commits in the 'master' branch and thus avoiding plain vanilla 'git merge' for 'squash' and 'rebase'.

http://stackoverflow.com/questions/2427238/in-git-what-is-th...