tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2009-03-25	Grammar fixes to "merge" and "patch-id" docs	Wincent Colaiuta	1	-7/+7
	Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-19	Documentation/git-merge: document subtree strategy.	Miklos Vajna	1	-0/+7
	There was already some documentation about subtree under Documentation/howto but it was missing from git-merge manpage. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2005-12-08	Documentation: recursive is the default strategy these days.	Junio C Hamano	1	-5/+5
	We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-06	Refactor merge strategies into separate includable file.	Jon Loeliger	1	-0/+35
	Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>