tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2016-11-11	t6026: clarify the point of "kill $(cat sleep.pid)"	Johannes Sixt	1	-1/+9
2016-11-10	t6026: ensure that long-running script really is	Johannes Schindelin	1	-4/+4
2016-11-10	Revert "t6026-merge-attr: don't fail if sleep exits early"	Junio C Hamano	1	-1/+1
2016-11-10	Revert "t6026-merge-attr: ensure that the merge driver was called"	Junio C Hamano	1	-2/+1
2016-11-10	t6026-merge-attr: ensure that the merge driver was called	Andreas Schwab	1	-1/+2
2016-11-08	t6026-merge-attr: don't fail if sleep exits early	Andreas Schwab	1	-1/+1
2016-09-07	t6026-merge-attr: clean up background process at end of test case	Johannes Sixt	1	-0/+2
2016-08-23	mingw: ensure temporary file handles are not inherited by child processes	Ben Wijen	1	-1/+1
2016-08-18	t6026-merge-attr: child processes must not inherit index.lock handles	Ben Wijen	1	-0/+13
2016-03-23	merge: refuse to create too cool a merge by default	Junio C Hamano	1	-1/+2
2015-06-24	Merge branch 'jc/ll-merge-expose-path'	Junio C Hamano	1	-5/+9
2015-06-04	ll-merge: pass the original path to external drivers	Junio C Hamano	1	-5/+9
2015-03-25	t: fix some trivial cases of ignored exit codes in loops	Jeff King	1	-3/+3
2010-01-20	conflict-marker-size: add test and docs	Junio C Hamano	1	-0/+12
2008-09-25	Merge branch 'mv/merge-recursive'	Shawn O. Pearce	1	-0/+22
2008-09-06	builtin-merge: release the lockfile in try_merge_strategy()	Miklos Vajna	1	-0/+22
2008-09-03	tests: use "git xyzzy" form (t3600 - t6999)	Nanako Shiraishi	1	-6/+6
2007-04-18	Custom low-level merge driver: change the configuration scheme.	Junio C Hamano	1	-2/+6
2007-04-18	Custom low-level merge driver support.	Junio C Hamano	1	-1/+70
2007-04-17	Add a demonstration/test of customized merge.	Junio C Hamano	1	-0/+72