tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2021-03-13	doc: describe mergetool configuration in git-mergetool(1)	Jonathan Nieder	1	-0/+4
2019-05-13	mergetool: fallback to tool when guitool unavailable	Denton Liu	1	-1/+3
2018-10-25	mergetool: accept -g/--[no-]gui as arguments	Denton Liu	1	-0/+11
2016-10-11	mergetool: honor -O<orderfile>	David Aguilar	1	-4/+6
2016-10-11	mergetool: honor diff.orderFile	David Aguilar	1	-0/+5
2014-04-24	mergetool: document the default for --[no-]prompt	Junio C Hamano	1	-3/+5
2013-05-17	documentation: trivial style cleanups	Felipe Contreras	1	-1/+1
2012-08-27	Merge branch 'da/difftool-updates'	Junio C Hamano	1	-0/+3
2012-08-10	mergetool,difftool: Document --tool-help consistently	David Aguilar	1	-0/+3
2012-07-23	mergetool: support --tool-help option like difftool does	Junio C Hamano	1	-3/+3
2011-10-10	Merge branch 'jm/mergetool-pathspec'	Junio C Hamano	1	-3/+4
2011-09-26	mergetool: Use args as pathspec to unmerged files	Jonathon Mah	1	-3/+4
2011-07-06	Documentation: use [verse] for SYNOPSIS sections	Martin von Zweigbergk	1	-0/+1
2011-03-19	Merge branch 'ss/mergetool--lib'	Junio C Hamano	1	-2/+2
2011-03-11	doc: drop author/documentation sections from most pages	Jeff King	1	-8/+0
2011-02-28	mergetool--lib: Add Beyond Compare 3 as a tool	Sebastian Schuberth	1	-1/+1
2011-02-28	mergetool--lib: Sort tools alphabetically for easier lookup	Sebastian Schuberth	1	-2/+2
2010-10-08	Use parentheses and `...' where appropriate	Štěpán Němec	1	-1/+1
2010-07-19	Documentation: Explain git-mergetool's use of temporary files	David Aguilar	1	-0/+10
2010-01-10	Documentation: spell 'git cmd' without dash throughout	Thomas Rast	1	-8/+8
2009-10-28	mergetool--lib: add p4merge as a pre-configured mergetool option	Scott Chacon	1	-1/+1
2009-05-24	mergetool--lib: add support for araxis merge	David Aguilar	1	-1/+1
2009-04-07	difftool/mergetool: add diffuse as merge and diff tool	Sebastian Pipping	1	-1/+1
2009-04-07	git-mergetool: add new merge tool TortoiseMerge	Markus Heidelberg	1	-1/+2
2009-01-17	Documentation: let asciidoc align related options	Markus Heidelberg	1	-2/+4
2009-01-01	Merge branch 'cb/mergetool'	Junio C Hamano	1	-1/+10
2008-12-09	Improve language in git-merge.txt and related docs	Ralf Wildenhues	1	-2/+2
2008-11-14	Add -y/--no-prompt option to mergetool	Charles Bailey	1	-1/+10
2008-08-05	Documentation: typos / spelling fixes	Mike Ralphson	1	-1/+1
2008-07-05	manpages: italicize git command names (which were in teletype font)	Jonathan Nieder	1	-8/+8
2008-07-01	Documentation formatting and cleanup	Jonathan Nieder	1	-1/+1
2008-07-01	Documentation: be consistent about "git-" versus "git "	Jonathan Nieder	1	-8/+8
2008-06-06	documentation: move git(7) to git(1)	Christian Couder	1	-1/+1
2008-03-08	merge-tool documentation: describe custom command usage	Charles Bailey	1	-0/+22
2008-03-08	git-mergetool documentaiton: show toolnames in typewriter font	Charles Bailey	1	-8/+8
2008-01-06	Documentation: rename gitlink macro to linkgit	Dan McGee	1	-2/+2
2007-10-18	mergetool: add support for ECMerge	Steffen Prohaska	1	-1/+1
2007-10-18	mergetool: use path to mergetool in config var mergetool.<tool>.path	Steffen Prohaska	1	-0/+6
2007-06-10	[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool	Dan McGee	1	-1/+1
2007-06-07	War on whitespace	Junio C Hamano	1	-1/+0
2007-05-03	Document 'opendiff' value in config.txt and git-mergetool.txt	Arjen Laarhoven	1	-1/+1
2007-03-29	Fix minor formatting issue in man page for git-mergetool	Theodore Ts'o	1	-5/+5
2007-03-18	mergetool: Add support for vimdiff.	James Bowes	1	-1/+1
2007-03-13	Add git-mergetool to run an appropriate merge conflict resolution program	Theodore Ts'o	1	-0/+46