git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Mon, 17 Jun 2019 17:15:15 +0000 (10:15 -0700)
committer	Junio C Hamano <redacted>
	Mon, 17 Jun 2019 17:15:15 +0000 (10:15 -0700)
commit	9b3897ab0620261585831e356168b56759849481
tree	3fae73cf58ce54acec26cc52edf5dcfe653f345d	tree \| snapshot
parent	86d87307c1c490282749e278380b9a258de0b46c	commit \| diff
parent	7663e438c5ca5a1dbcfcb1a9cbf68480362998a2	commit \| 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

RSS Atom

git clone https://git.99rst.org/PROJECT