tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2010-01-17	Document that merge strategies can now take their own options	Junio C Hamano	1	-1/+28
	Also document the recently added -Xtheirs, -Xours and -Xsubtree[=path] options to the merge-recursive strategy. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-15	Documentation: clarify 'ours' merge strategy	Thomas Rast	1	-2/+3
	Make it clear in the docs that the merge takes the tree of HEAD and ignores everything in the other branches. This should hopefully clear up confusion, usually caused by the user looking for a strategy that resolves all conflict hunks in favour of HEAD (which is completely different and currently not supported). Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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>