kernel/git - git - PowerEL Git System

36 Tags

131 MiB

Tree: ddb95de33e

Author	SHA1	Message	Date
Dan McGee	730b5b45fb	[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool Signed-off-by: Dan McGee <dpmcgee@gmail.com> Acked-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
Junio C Hamano	a6080a0a44	War on whitespace 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>	18 years ago
Arjen Laarhoven	e4e92b3f4b	Document 'opendiff' value in config.txt and git-mergetool.txt Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	18 years ago
Theodore Ts'o	e15b484f6a	Fix minor formatting issue in man page for git-mergetool Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
James Bowes	9cec65399d	mergetool: Add support for vimdiff. Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	18 years ago
Theodore Ts'o	c4b4a5af16	Add git-mergetool to run an appropriate merge conflict resolution program 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>	18 years ago