tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2007-09-28	mergetool: Fix typo in options passed to kdiff3	Theodore Ts'o	1	-2/+2
2007-09-28	mergetool: fix emerge when running in a subdirectory	Theodore Ts'o	1	-2/+2
2007-09-28	Mergetool generating blank files (1.5.3)	Junio C Hamano	1	-3/+4
2007-09-23	Supplant the "while case ... break ;; esac" idiom	David Kastrup	1	-1/+1
2007-07-02	Rewrite "git-frotz" to "git frotz"	Junio C Hamano	1	-8/+8
2007-06-10	git-mergetool: Make default selection of merge-tool more intelligent	Theodore Ts'o	1	-17/+29
2007-06-10	[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool	Dan McGee	1	-2/+10
2007-06-06	Fix typo in git-mergetool	Josh Triplett	1	-1/+1
2007-03-29	mergetool: Clean up description of files and prompts for merge resolutions	Theodore Ts'o	1	-12/+15
2007-03-29	mergetool: Make git-rm quiet when resolving a deleted file conflict	Theodore Ts'o	1	-1/+1
2007-03-29	mergetool: Add support for Apple Mac OS X's opendiff command	Theodore Ts'o	1	-2/+14
2007-03-29	mergetool: Fix abort command when resolving symlinks and deleted files	Theodore Ts'o	1	-4/+4
2007-03-29	mergetool: Remove spurious error message if merge.tool config option not set	Theodore Ts'o	1	-1/+1
2007-03-29	mergetool: factor out common code	Theodore Ts'o	1	-42/+36
2007-03-29	mergetool: portability fix: don't use reserved word function	Theodore Ts'o	1	-5/+5
2007-03-29	mergetool: portability fix: don't assume true is in /bin	Theodore Ts'o	1	-2/+2
2007-03-29	mergetool: Don't error out in the merge case where the local file is deleted	Theodore Ts'o	1	-6/+5
2007-03-29	mergetool: Replace use of "echo -n" with printf(1) to be more portable	Theodore Ts'o	1	-14/+12
2007-03-18	mergetool: print an appropriate warning if merge.tool is unknown	Theodore Ts'o	1	-4/+9
2007-03-18	mergetool: Add support for vimdiff.	James Bowes	1	-3/+5
2007-03-13	Add git-mergetool to run an appropriate merge conflict resolution program	Theodore Ts'o	1	-0/+352