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

author	Junio C Hamano <redacted>
	Mon, 20 Aug 2018 19:41:33 +0000 (12:41 -0700)
committer	Junio C Hamano <redacted>
	Mon, 20 Aug 2018 19:41:33 +0000 (12:41 -0700)
commit	5a5c5e95653f8db61ca9d1a30159dcf5dc4a8d6a
tree	5e007fc315fb147b9cd06ec40a4a0f67b2f88077	tree \| snapshot
parent	36fd1e843b83a1ee10178e7da19eee3dee590580	commit \| diff
parent	bc9238bb0910f6d21e021e5c3061bf2124c3a176	commit \| diff

Merge branch 'pw/rebase-i-merge-segv-fix'

"git rebase -i", when a 'merge <branch>' insn in its todo list
fails, segfaulted, which has been (minimally) corrected.

* pw/rebase-i-merge-segv-fix:
rebase -i: fix SIGSEGV when 'merge <branch>' fails
t3430: add conflicting commit

sequencer.c	diff1 \|	diff2 \|	blob \| history
t/t3430-rebase-merges.sh	diff1 \|	diff2 \|	blob \| history

RSS Atom

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

sequencer.c	diff1 \|	diff2 \|	blob \| history
t/t3430-rebase-merges.sh	diff1 \|	diff2 \|	blob \| history