path: root/
AgeCommit message (Collapse)Author
2008-07-05Retire 'stupid' merge strategyMiklos 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: <> Signed-off-by: Junio C Hamano <>
2007-08-31Fixing comment in merge strategiesTom Clarke
Comments in both these strategies refer to the wrong number of remotes Signed-off-by: Tom Clarke <> Signed-off-by: Junio C Hamano <>
2007-07-03Rewrite "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 <>
2005-09-11Use 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 <>