fingernails in oatmeal, The Unsightliness of Merge Commits - and a bit more about git commit/push/rebase and all that stuff around it. Also quite well translatable to Mercurial.