diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 14:27:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 14:27:09 -0700 |
| commit | 5bbbd576f5f9048200324424726daf4cc004ab3a (patch) | |
| tree | c05acac3a6b817119697f3b6ad735ecedcce7b4a /builtin/commit-graph.c | |
| parent | 5ca0db3fcaa46cdaa06268727a10abc438cc4af3 (diff) | |
| parent | 7663e438c5ca5a1dbcfcb1a9cbf68480362998a2 (diff) | |
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
Diffstat (limited to 'builtin/commit-graph.c')
0 files changed, 0 insertions, 0 deletions