delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Retire 'stupid' merge strategy	Miklos Vajna	2008-07-05	1	-80/+0
\| \| \| \| \| \| \| \| \| \| \|	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>
*	Fixing comment in merge strategies	Tom Clarke	2007-08-30	1	-1/+1
\| \| \| \| \| \| \| \|	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	1	-5/+5
\| \| \| \| \| \|	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	1	-0/+80
	And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net>