tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2007-06-10	[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool	Dan McGee	1	-1/+1
	Signed-off-by: Dan McGee <dpmcgee@gmail.com> Acked-by: "Theodore Ts'o" <tytso@mit.edu>
2007-06-07	War on whitespace	Junio C Hamano	1	-1/+0
	This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-05-03	Document 'opendiff' value in config.txt and git-mergetool.txt	Arjen Laarhoven	1	-1/+1
	Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-03-29	Fix minor formatting issue in man page for git-mergetool	Theodore Ts'o	1	-5/+5
	Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-03-18	mergetool: Add support for vimdiff.	James Bowes	1	-1/+1
	Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2007-03-13	Add git-mergetool to run an appropriate merge conflict resolution program	Theodore Ts'o	1	-0/+46
	The git-mergetool program can be used to automatically run an appropriate merge resolution program to resolve merge conflicts. It will automatically run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>