Merge branch 'jk/am-i-resolved-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 21:27:09 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 21:27:09 +0000 (14:27 -0700)
commit5bbbd576f5f9048200324424726daf4cc004ab3a
treec05acac3a6b817119697f3b6ad735ecedcce7b4a
parent5ca0db3fcaa46cdaa06268727a10abc438cc4af3
parent7663e438c5ca5a1dbcfcb1a9cbf68480362998a2
Merge branch 'jk/am-i-resolved-fix' into maint

"git am -i --resolved" segfaulted after trying to see a commit as
if it were a tree, which has been corrected.

* jk/am-i-resolved-fix:
  am: fix --interactive HEAD tree resolution
  am: drop tty requirement for --interactive
  am: read interactive input from stdin
  am: simplify prompt response handling
builtin/am.c