diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-17 10:15:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-17 10:15:15 -0700 |
| commit | 9b3897ab0620261585831e356168b56759849481 (patch) | |
| tree | 3fae73cf58ce54acec26cc52edf5dcfe653f345d /builtin/commit.c | |
| parent | 86d87307c1c490282749e278380b9a258de0b46c (diff) | |
| parent | 7663e438c5ca5a1dbcfcb1a9cbf68480362998a2 (diff) | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions