Merge branch 'jk/unbreak-am-h' into maint

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

Junio C Hamano committed Jun 5, 2017 at 09:03 UTC f72e075e300cd4fb74adf61d574fd2125c37e2eb

No changes.