tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2017-01-18	Merge branch 'rh/mergetool-regression-fix'	Junio C Hamano	1	-114/+165
2017-01-18	Merge branch 'pb/test-must-fail-is-for-git'	Junio C Hamano	1	-1/+1
2017-01-10	mergetool: fix running in subdir when rerere enabled	Richard Hansen	1	-1/+6
2017-01-10	t7610: add test case for rerere+mergetool+subdir bug	Richard Hansen	1	-1/+20
2017-01-10	t7610: spell 'git reset --hard' consistently	Richard Hansen	1	-18/+19
2017-01-10	t7610: don't assume the checked-out commit	Richard Hansen	1	-6/+6
2017-01-10	t7610: always work on a test-specific branch	Richard Hansen	1	-2/+8
2017-01-10	t7610: delete some now-unnecessary 'git reset --hard' lines	Richard Hansen	1	-2/+0
2017-01-10	t7610: run 'git reset --hard' after each test to clean up	Richard Hansen	1	-0/+8
2017-01-10	t7610: don't rely on state from previous test	Richard Hansen	1	-0/+6
2017-01-10	t7610: use test_when_finished for cleanup tasks	Richard Hansen	1	-34/+37
2017-01-10	t7610: move setup code to the 'setup' test case	Richard Hansen	1	-30/+35
2017-01-10	t7610: update branch names to match test number	Richard Hansen	1	-41/+41
2017-01-07	don't use test_must_fail with grep	Pranit Bauva	1	-1/+1
2016-12-16	Merge branch 'ak/lazy-prereq-mktemp'	Junio C Hamano	1	-1/+2
2016-11-29	t7610: clean up foo.XXXXXX tmpdir	Jeff King	1	-1/+2
2016-10-11	mergetool: honor -O<orderfile>	David Aguilar	1	-0/+27
2016-10-11	mergetool: honor diff.orderFile	David Aguilar	1	-0/+33
2016-07-06	t7610: test for mktemp before test execution	Armin Kunaschik	1	-1/+6
2016-03-10	mergetool: honor tempfile configuration when resolving delete conflicts	David Aguilar	1	-0/+25
2016-03-10	mergetool: support delete/delete conflicts	David Aguilar	1	-0/+39
2015-09-08	t7610: don't use test_config in a subshell	John Keeping	1	-1/+1
2014-10-21	Merge branch 'da/mergetool-temporary-directory'	Junio C Hamano	1	-0/+23
2014-10-16	t7610-mergetool: add test cases for mergetool.writeToTemp	David Aguilar	1	-0/+23
2014-10-16	t7610-mergetool: use test_config to isolate tests	David Aguilar	1	-5/+3
2014-10-15	t7610-mergetool: prefer test_config over git config	David Aguilar	1	-11/+9
2014-10-15	t7610-mergetool: add missing && and remove commented-out code	David Aguilar	1	-8/+2
2014-10-15	t7610-mergetool: use tabs instead of a mix of tabs and spaces	David Aguilar	1	-459/+459
2013-08-06	rm: delete .gitmodules entry of submodules removed from the work tree	Jens Lehmann	1	-3/+3
2013-04-12	Correct common spelling mistakes in comments and tests	Stefano Lattarini	1	-1/+1
2012-10-01	Merge branch 'da/mergetool-custom'	Junio C Hamano	1	-0/+13
2012-09-25	mergetool--lib: Allow custom commands to override built-ins	David Aguilar	1	-0/+13
2012-08-17	stash: invoke rerere in case of conflict	Phil Hord	1	-1/+1
2012-08-17	test: git-stash conflict sets up rerere	Phil Hord	1	-0/+38
2012-01-23	mergetool: Provide an empty file when needed	David Aguilar	1	-1/+27
2011-09-26	mergetool: Use args as pathspec to unmerged files	Jonathon Mah	1	-18/+40
2011-04-13	mergetool: Teach about submodules	Jonathon Mah	1	-3/+287
2011-02-16	mergetool: don't skip modify/remove conflicts	Martin von Zweigbergk	1	-6/+34
2010-11-09	tests: add missing &&	Jonathan Nieder	1	-1/+1
2010-08-24	t7610: cd inside subshell instead of around	Brian Gernhardt	1	-23/+26
2010-08-17	mergetool: Skip autoresolved paths	David Aguilar	1	-12/+34
2009-01-31	mergetool: fix running mergetool in sub-directories	Charles Bailey	1	-1/+1
2009-01-31	mergetool: Add a test for running mergetool in a sub-directory	Charles Bailey	1	-19/+51
2009-01-27	mergetool: respect autocrlf by using checkout-index	Charles Bailey	1	-2/+13
2008-09-03	tests: use "git xyzzy" form (t7200 - t9001)	Nanako Shiraishi	1	-1/+1
2008-07-13	t/: Use "test_must_fail git" instead of "! git"	Stephan Beyer	1	-1/+1
2008-07-04	Fix executable bits in t/ scripts	Junio C Hamano	1	-0/+0
2008-03-05	Add a very basic test script for git mergetool	Charles Bailey	1	-0/+46