Merge branch 'jk/unbreak-am-h'

"git am -h" triggered a BUG(). * jk/unbreak-am-h: am: handle "-h" argument earlier

Junio C Hamano committed Jun 4, 2017 at 09:55 UTC fe3bf4cb526aa85941c30b6e9104e8b0a84094c3

No changes.