While this somewhat underscores some complexity in git, here's something I wrote trying to explain to others why and how to avoid those merge commits: http://m

While this somewhat underscores some complexity in git, here's something I wrote trying to explain to others why and how to avoid those merge commits: http://michaeldehaan.net/post/116465000577/understanding-when-to-use-git-rebase http://michaeldehaan.net/post/116465000577/understanding-whe...