git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2008-07-05	Retire 'stupid' merge strategy	Miklos Vajna
	As pointed out by Linus, this strategy tries to take the best merge base, but 'recursive' just does it better. If one needs something more than 'resolve' then he/she should really use 'recursive' and not 'stupid'. Cf. Message-ID: <alpine.LFD.1.10.0807030947360.18105@woody.linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-08-31	Fixing comment in merge strategies	Tom Clarke
	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>
2007-07-03	Rewrite "git-frotz" to "git frotz"	Junio C Hamano
	This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
2005-09-11	Use Daniel's read-tree in the merge strategy 'resolve'.	Junio C Hamano
	And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net>