tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2018-11-08	merge-recursive: improve handling for rename/rename(2to1) conflicts	Elijah Newren	1	-35/+48
2018-07-16	t6000-t6999: fix broken &&-chains	Eric Sunshine	1	-1/+1
2018-05-08	merge-recursive: fix check for skipability of working tree updates	Elijah Newren	1	-1/+1
2018-05-08	merge-recursive: avoid spurious rename/rename conflict from dir renames	Elijah Newren	1	-30/+25
2018-05-08	directory rename detection: new testcases showcasing a pair of bugs	Elijah Newren	1	-0/+296
2018-05-08	merge-recursive: fix remaining directory rename + dirty overwrite cases	Elijah Newren	1	-4/+4
2018-05-08	merge-recursive: fix overwriting dirty files involved in renames	Elijah Newren	1	-1/+1
2018-05-08	merge-recursive: avoid clobbering untracked files with directory renames	Elijah Newren	1	-3/+3
2018-05-08	merge-recursive: apply necessary modifications for directory renames	Elijah Newren	1	-25/+25
2018-05-08	merge-recursive: check for file level conflicts then get new name	Elijah Newren	1	-1/+1
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
2018-04-20	directory rename detection: basic testcases	Elijah Newren	1	-0/+442
2018-04-11	Revert "Merge branch 'en/rename-directory-detection'"	Junio C Hamano	1	-3998/+0
2018-02-27	merge-recursive: ensure we write updates for directory-renamed file	Elijah Newren	1	-1/+1
2018-02-27	merge-recursive: avoid spurious rename/rename conflict from dir renames	Elijah Newren	1	-30/+25
2018-02-27	directory rename detection: new testcases showcasing a pair of bugs	Elijah Newren	1	-0/+296
2018-02-27	merge-recursive: fix remaining directory rename + dirty overwrite cases	Elijah Newren	1	-4/+4
2018-02-27	merge-recursive: fix overwriting dirty files involved in renames	Elijah Newren	1	-1/+1
2018-02-27	merge-recursive: avoid clobbering untracked files with directory renames	Elijah Newren	1	-3/+3
2018-02-27	merge-recursive: apply necessary modifications for directory renames	Elijah Newren	1	-25/+25
2018-02-14	merge-recursive: check for file level conflicts then get new name	Elijah Newren	1	-1/+1
2018-02-14	directory rename detection: tests for handling overwriting dirty files	Elijah Newren	1	-0/+458
2018-02-14	directory rename detection: tests for handling overwriting untracked files	Elijah Newren	1	-0/+367
2018-02-14	directory rename detection: miscellaneous testcases to complete coverage	Elijah Newren	1	-1/+564
2018-02-14	directory rename detection: testcases exploring possibly suboptimal merges	Elijah Newren	1	-0/+404
2018-02-14	directory rename detection: more involved edge/corner testcases	Elijah Newren	1	-0/+396
2018-02-14	directory rename detection: testcases checking which side did the rename	Elijah Newren	1	-0/+336
2018-02-14	directory rename detection: files/directories in the way of some renames	Elijah Newren	1	-0/+330
2018-02-14	directory rename detection: partially renamed directory testcase/discussion	Elijah Newren	1	-0/+115
2018-02-14	directory rename detection: testcases to avoid taking detection too far	Elijah Newren	1	-0/+153
2018-02-14	directory rename detection: directory splitting testcases	Elijah Newren	1	-0/+143
2018-02-14	directory rename detection: basic testcases	Elijah Newren	1	-0/+442