org/kernel/git.git - forked from git/git

	Commit message (Collapse)	Author	Age
*	Documentation/git-merge: document subtree strategy.	Miklos Vajna	2008-03-19
\| \| \| \| \| \| \| \|	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>
*	Documentation: recursive is the default strategy these days.	Junio C Hamano	2005-12-08
\| \| \| \| \| \|	We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Refactor merge strategies into separate includable file.	Jon Loeliger	2005-11-06
	Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>