My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0506fc f3a2fff)
Merge branch 'jk/unbreak-am-h' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:03:15 +0000 (09:03 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:03:15 +0000 (09:03 +0900)
"git am -h" triggered a BUG().

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

1  2 
builtin/am.c patch | diff1 | diff2 | blob | history

diff --cc builtin/am.c
Simple merge
The core git plumbing