]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 86d8730 7663e43)
Merge branch 'jk/am-i-resolved-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2019 17:15:15 +0000 (10:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2019 17:15:15 +0000 (10:15 -0700)
commit9b3897ab0620261585831e356168b56759849481
tree3fae73cf58ce54acec26cc52edf5dcfe653f345dtree | snapshot
parent86d87307c1c490282749e278380b9a258de0b46ccommit | diff
parent7663e438c5ca5a1dbcfcb1a9cbf68480362998a2commit | 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
builtin/am.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.