git - git

	Commit message (Expand)	Author	Files	Lines
2018-05-08	merge-recursive: avoid clobbering untracked files with directory renames	Elijah Newren	2	-5/+43
2018-05-08	merge-recursive: apply necessary modifications for directory renames	Elijah Newren	2	-26/+211
2018-05-08	merge-recursive: when comparing files, don't include trees	Elijah Newren	1	-6/+21
2018-05-08	merge-recursive: check for file level conflicts then get new name	Elijah Newren	4	-9/+199
2018-05-08	merge-recursive: add computation of collisions due to dir rename & merging	Elijah Newren	2	-3/+150
2018-05-08	merge-recursive: check for directory level conflicts	Elijah Newren	1	-0/+119
2018-05-08	merge-recursive: add get_directory_renames()	Elijah Newren	2	-3/+239
2018-04-20	merge-recursive: make a helper function for cleanup for handle_renames	Elijah Newren	1	-10/+13
2018-04-20	merge-recursive: split out code for determining diff_filepairs	Elijah Newren	1	-22/+62
2018-04-20	merge-recursive: make !o->detect_rename codepath more obvious	Elijah Newren	1	-2/+9
2018-04-20	merge-recursive: fix leaks of allocated renames and diff_filepairs	Elijah Newren	1	-5/+15
2018-04-20	merge-recursive: introduce new functions to handle rename logic	Elijah Newren	1	-10/+33
2018-04-20	merge-recursive: move the get_renames() function	Elijah Newren	1	-69/+70
2018-04-20	directory rename detection: tests for handling overwriting dirty files	Elijah Newren	1	-0/+458
2018-04-20	directory rename detection: tests for handling overwriting untracked files	Elijah Newren	1	-0/+367
2018-04-20	directory rename detection: miscellaneous testcases to complete coverage	Elijah Newren	1	-1/+564
2018-04-20	directory rename detection: testcases exploring possibly suboptimal merges	Elijah Newren	1	-0/+404
2018-04-20	directory rename detection: more involved edge/corner testcases	Elijah Newren	1	-0/+396
2018-04-20	directory rename detection: testcases checking which side did the rename	Elijah Newren	1	-0/+336
2018-04-20	directory rename detection: files/directories in the way of some renames	Elijah Newren	1	-0/+330
2018-04-20	directory rename detection: partially renamed directory testcase/discussion	Elijah Newren	1	-0/+115
2018-04-20	directory rename detection: testcases to avoid taking detection too far	Elijah Newren	1	-0/+153
2018-04-20	directory rename detection: directory splitting testcases	Elijah Newren	1	-0/+143