dealing with git am failures

[Matthew Hayes]

I was having trouble applying some patches with "git am".  I found this
blog post helpful:

http://www.pizzhacks.com/bugdrome/2011/10/deal-with-git-am-failures/