tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2014-02-24	merge-recursive.c: tolerate missing files while refreshing index	Brad King	1	-1/+1
2014-02-24	t3030-merge-recursive: test known breakage with empty work tree	Brad King	1	-0/+47
2013-06-07	t3030: use test_ln_s_add to remove SYMLINKS prerequisite	Johannes Sixt	1	-36/+26
2011-12-09	t3030 (merge-recursive): use test_expect_code	Ramkumar Ramachandra	1	-66/+6
2011-08-14	t3030: fix accidental success in symlink rename	Jeff King	1	-2/+5
2011-04-13	i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200	Junio C Hamano	1	-4/+4
2011-03-09	i18n: git-merge "You have not concluded your merge" messages	Ævar Arnfjörð Bjarmason	1	-1/+1
2010-11-29	Merge branch 'en/merge-recursive'	Junio C Hamano	1	-1/+36
2010-11-09	tests: add missing &&	Jonathan Nieder	1	-1/+1
2010-09-29	t3030: Add a testcase for resolvable rename/add conflict with symlinks	Schalk, Ken	1	-1/+36
2010-09-15	Merge branch 'ks/recursive-rename-add-identical'	Junio C Hamano	1	-0/+35
2010-09-03	RE: [PATCH] Avoid rename/add conflict when contents are identical	Schalk, Ken	1	-0/+35
2010-08-11	unpack_trees: group error messages by type	Matthieu Moy	1	-1/+1
2010-06-11	merge-recursive: demonstrate an incorrect conflict with submodule	Johannes Sixt	1	-0/+29
2010-01-12	Be more user-friendly when refusing to do something because of conflict.	Matthieu Moy	1	-2/+4
2009-06-01	refuse to merge during a merge	Clemens Buchacher	1	-0/+3
2008-09-26	Remove empty directories in recursive merge	Alex Riesen	1	-0/+11
2008-09-03	tests: use "git xyzzy" form (t0000 - t3599)	Nanako Shiraishi	1	-7/+7
2008-08-23	merge: fix numerus bugs around "trivial merge" area	Junio C Hamano	1	-0/+11
2008-05-24	tests: do not use implicit "git diff --no-index"	Junio C Hamano	1	-21/+21
2007-06-07	War on whitespace	Junio C Hamano	1	-1/+0
2007-04-19	Remove case-sensitive file in t3030-merge-recursive.	Brian Gernhardt	1	-52/+52
2007-04-10	t3030: merge-recursive backend test.	Junio C Hamano	1	-0/+528