git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	merge-recursive: enforce rule that index matches head before merging	Elijah Newren	2018-07-11	1	-11/+8
*	t6044: add more testcases with staged changes before a merge is invoked	Elijah Newren	2018-07-11	1	-0/+29
*	merge-recursive: fix assumption that head tree being merged is HEAD	Elijah Newren	2018-07-11	1	-1/+1
*	merge-recursive: make sure when we say we abort that we actually abort	Elijah Newren	2018-07-11	1	-1/+1
*	t6044: add a testcase for index matching head, when head doesn't match HEAD	Elijah Newren	2018-07-11	1	-0/+11
*	t6044: verify that merges expected to abort actually abort	Elijah Newren	2018-07-03	1	-11/+21
*	merge-recursive: avoid incorporating uncommitted changes in a merge	Elijah Newren	2017-12-22	1	-1/+1
*	t6044: recursive can silently incorporate dirty changes in a merge	Elijah Newren	2017-12-22	1	-5/+21
*	Merge branch 'js/t6044-use-test-seq'	Junio C Hamano	2016-05-30	1	-2/+2
\|\
\| *	t6044: replace seq by test_seq	Johannes Sixt	2016-05-18	1	-2/+2
* \|	merge-octopus: abort if index does not match HEAD	Elijah Newren	2016-04-13	1	-3/+3
\|/
*	t6044: new merge testcases for when index doesn't match HEAD	Elijah Newren	2016-04-13	1	-0/+153