| commit | 51add76e92c9de9bcad3d421303b45ab488d529e | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Sat, 5 Jul 2008 14:43:51 +0000 (5 16:43 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 5 Jul 2008 17:43:46 +0000 (5 10:43 -0700) | ||
| tree | 96d2774de499bf213ea1f1d6e33ffcf1ce4cac1e | treesnapshot (tar.gz zip) |
| parent | 6cf91492d9cd985e1fa65181d99d6d578d4439dc | commitdiff |
Retire 'stupid' merge strategy
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>
| .gitignore | diffblobblamehistory | |
| Makefile | diffblobblamehistory | |
| git-merge-stupid.sh | [deleted file] | blobblamehistory |