Merge branch 'jk/unbreak-am-h' into maint
commitf72e075e300cd4fb74adf61d574fd2125c37e2eb
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:03:15 +0000 (5 09:03 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:03:15 +0000 (5 09:03 +0900)
tree381df80a5887425bf99bfefad2dade17908a9fa5
parentd0506fc419f61266e49077b7bed255d7691c0919
parentf3a2fffe06d13b216cbc18acba5a46b8a00ae326
Merge branch 'jk/unbreak-am-h' into maint

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

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