From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 Jun 2017 00:55:44 +0000 (+0900)
Subject: Merge branch 'jk/unbreak-am-h'
X-Git-Tag: v2.14.0-rc0~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe3bf4cb526aa85941c30b6e9104e8b0a84094c3;p=thirdparty%2Fgit.git

Merge branch 'jk/unbreak-am-h'

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

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

fe3bf4cb526aa85941c30b6e9104e8b0a84094c3