From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Jun 2019 17:15:15 +0000 (-0700)
Subject: Merge branch 'jk/am-i-resolved-fix'
X-Git-Tag: v2.23.0-rc0~121
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9b3897ab0620261585831e356168b56759849481

Merge branch 'jk/am-i-resolved-fix'

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

9b3897ab0620261585831e356168b56759849481