tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2011-08-19	mergetool--lib: Refactor tools into separate files	David Aguilar	1	-333/+52
2011-08-19	mergetool--lib: Make style consistent with git	David Aguilar	1	-53/+100
2011-08-05	misc-sh: fix up whitespace in some other .sh files.	Jon Seymour	1	-3/+3
2011-06-29	Merge branch 'da/git-prefix-everywhere' into next	Junio C Hamano	1	-0/+7
2011-05-26	git-mergetool--lib: Make vimdiff retain the current directory	David Aguilar	1	-0/+7
2011-05-01	Pass empty file to p4merge where no base is suitable.	Ciaran Jessup	1	-6/+3
2011-03-19	Merge branch 'ss/mergetool--lib'	Junio C Hamano	1	-104/+121
2011-02-28	mergetool--lib: Add Beyond Compare 3 as a tool	Sebastian Schuberth	1	-2/+20
2011-02-28	mergetool--lib: Sort tools alphabetically for easier lookup	Sebastian Schuberth	1	-110/+109
2011-02-25	mergetool-lib: call vim in readonly mode for diffs	Michael J Gruber	1	-2/+2
2010-09-29	mergetool-lib: make the three-way diff the default for vim/gvim	Dan McGee	1	-3/+15
2010-09-15	mergetool-lib: add a three-way diff view for vim/gvim	Dan McGee	1	-2/+7
2010-09-15	mergetool-lib: combine vimdiff and gvimdiff run blocks	Dan McGee	1	-14/+3
2010-08-20	mergetool: Remove explicit references to /dev/tty	Charles Bailey	1	-1/+1
2010-01-29	add shebang line to git-mergetool--lib.sh	Jeff King	1	-0/+1
2009-11-25	Merge branch 'rs/work-around-grep-opt-insanity'	Junio C Hamano	1	-7/+6
2009-11-23	mergetool--lib: simplify guess_merge_tool()	René Scharfe	1	-7/+6
2009-10-28	mergetool--lib: add p4merge as a pre-configured mergetool option	Scott Chacon	1	-2/+15
2009-05-24	mergetool--lib: add support for araxis merge	David Aguilar	1	-2/+23
2009-05-09	mergetool--lib: specialize diff options for emerge and ecmerge	David Aguilar	1	-3/+3
2009-04-12	mergetool--lib: simplify API usage by removing more global variables	David Aguilar	1	-51/+58
2009-04-08	difftool/mergetool: refactor commands to use git-mergetool--lib	David Aguilar	1	-0/+378