Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/unbreak-am-h'
author
Junio C Hamano
<gitster@pobox.com>
Sun, 4 Jun 2017 00:55:44 +0000
(09:55 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 4 Jun 2017 00:55:44 +0000
(09:55 +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
raw
|
combined
(merge:
9af9703
f3a2fff
)
diff --cc
builtin/am.c
Simple merge