tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2011-04-28	Merge branch 'en/merge-recursive'	Junio C Hamano	1	-0/+63
2011-03-02	merge-recursive: When we detect we can skip an update, actually skip it	Elijah Newren	1	-1/+1
2011-03-02	t6022: New test checking for unnecessary updates of files in D/F conflicts	Elijah Newren	1	-0/+33
2011-03-02	t6022: New test checking for unnecessary updates of renamed+modified files	Elijah Newren	1	-0/+30
2010-11-29	Merge branch 'en/merge-recursive'	Junio C Hamano	1	-0/+366
2010-11-17	t6022: Use -eq not = to test output of wc -l	Brian Gernhardt	1	-32/+32
2010-11-09	t6022 (renaming merge): chain test commands with &&	Jonathan Nieder	1	-190/+92
2010-09-29	merge_content(): Check whether D/F conflicts are still present	Elijah Newren	1	-4/+4
2010-09-29	conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts	Elijah Newren	1	-1/+1
2010-09-29	conflict_rename_delete(): Check whether D/F conflicts are still present	Elijah Newren	1	-2/+2
2010-09-29	merge-recursive: Delay content merging for renames	Elijah Newren	1	-1/+1
2010-09-29	merge-recursive: Move handling of double rename of one file to two	Elijah Newren	1	-1/+1
2010-09-29	t6022: Add tests for rename/rename combined with D/F conflicts	Elijah Newren	1	-0/+79
2010-09-29	t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)	Elijah Newren	1	-0/+63
2010-09-29	t6022: Add tests with both rename source & dest involved in D/F conflicts	Elijah Newren	1	-0/+38
2010-09-29	t6022: Add tests for reversing order of merges when D/F conflicts present	Elijah Newren	1	-0/+58
2010-09-29	t6022: Add test combinations of {content conflict?, D/F conflict remains?}	Elijah Newren	1	-0/+128
2010-05-31	tests: use "test_cmp", not "diff", when verifying the result	Gary V. Vaughan	1	-2/+2
2007-04-25	Add a test for merging changed and rename-changed branches	Alex Riesen	1	-0/+23
2006-10-27	t6022: ignoring untracked files by merge-recursive when they do not matter	Junio C Hamano	1	-23/+142
2006-10-27	tests: merge-recursive is usable without Python	Junio C Hamano	1	-6/+0
2006-05-17	read-tree -m -u: do not overwrite or remove untracked working tree files.	Junio C Hamano	1	-0/+1
2006-02-18	Optionally work without python	Johannes Schindelin	1	-0/+6
2005-12-21	merge-recursive: conflicting rename case.	Junio C Hamano	1	-0/+37
2005-12-11	t/t6022: a new test for renaming merge.	Junio C Hamano	1	-0/+164