tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2011-05-06	merge: introduce merge.ff configuration variable	Junio C Hamano	1	-0/+10
2011-04-01	Merge branch 'jc/merge-sans-branch'	Junio C Hamano	1	-0/+10
2011-03-24	merge: merge with the default upstream branch without argument	Junio C Hamano	1	-0/+10
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	-4/+4
2011-01-04	Fix typos in the documentation	Ralf Wildenhues	1	-1/+1
2010-09-29	Merge branch 'rr/fmt-merge-msg'	Junio C Hamano	1	-2/+4
2010-09-09	merge: Make 'merge.log' an integer or boolean option	Ramkumar Ramachandra	1	-2/+4
2010-07-02	Avoid conflicts when merging branches with mixed normalization	Eyvind Bernhardsen	1	-0/+10
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/+1
2009-04-07	doc/merge-config: list ecmerge as a built-in merge tool	Markus Heidelberg	1	-1/+2
2008-12-09	Improve language in git-merge.txt and related docs	Ralf Wildenhues	1	-6/+6
2008-11-26	Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc	Junio C Hamano	1	-3/+11
2008-09-12	Fix some manual typos.	Ralf Wildenhues	1	-1/+1
2008-08-05	Documentation: typos / spelling fixes	Mike Ralphson	1	-2/+2
2008-05-03	add merge.renamelimit config option	Jeff King	1	-0/+5
2008-04-12	fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable	SZEDER Gábor	1	-1/+1
2008-04-12	add 'merge.stat' config variable	SZEDER Gábor	1	-0/+4
2008-04-12	doc: moved merge.* config variables into separate merge-config.txt	SZEDER Gábor	1	-0/+31