From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jul 2019 21:27:09 +0000 (-0700)
Subject: Merge branch 'jk/am-i-resolved-fix' into maint
X-Git-Tag: v2.23.0-rc0~6^2~18
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5bbbd576f5f9048200324424726daf4cc004ab3a

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
---

5bbbd576f5f9048200324424726daf4cc004ab3a