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-whe...
http://michaeldehaan.net/post/116465000577/understanding-whe...
This is my basic understanding in terms of how I use git. I like Mercurial too and don't have a horse in this race.