From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Jun 2017 00:03:15 +0000 (+0900)
Subject: Merge branch 'jk/unbreak-am-h' into maint
X-Git-Tag: v2.13.1~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f72e075e300cd4fb74adf61d574fd2125c37e2eb;p=thirdparty%2Fgit.git

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

"git am -h" triggered a BUG().

* jk/unbreak-am-h:
  am: handle "-h" argument earlier
---

f72e075e300cd4fb74adf61d574fd2125c37e2eb