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

	Commit message (Collapse)	Author	Age
*	Fixing comment in merge strategies	Tom Clarke	2007-08-30
\| \| \| \| \| \| \| \|	Comments in both these strategies refer to the wrong number of remotes Signed-off-by: Tom Clarke <tom@u2i.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Rewrite "git-frotz" to "git frotz"	Junio C Hamano	2007-07-02
\| \| \| \| \| \|	This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Use Daniel's read-tree in the merge strategy 'resolve'.	Junio C Hamano	2005-09-10
	And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net>