delta/git.git/git-merge-stupid.sh, branch ws/curl-http-proxy-over-https github.com: git/git.git Retire 'stupid' merge strategy 2008-07-05T17:43:46+00:00 Miklos Vajna vmiklos@frugalware.org 2008-07-05T14:43:51+00:00 51add76e92c9de9bcad3d421303b45ab488d529e 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> 
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 2007-08-31T00:18:22+00:00 Tom Clarke tom@u2i.com 2007-08-30T21:12:44+00:00 7d3c82a7610ac9ba11a26e1e594e48e0ebef629a 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> 
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" 2007-07-03T05:52:14+00:00 Junio C Hamano gitster@pobox.com 2007-07-03T05:52:14+00:00 5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3 This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com> 
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'. 2005-09-11T01:30:41+00:00 Junio C Hamano junkio@cox.net 2005-09-11T00:56:19+00:00 2276aa6c098a0337bc2bec49742e332bdd1b802c And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net> 
And rename the one Linus kept calling stupid, 'stupid'.

Signed-off-by: Junio C Hamano <junkio@cox.net>