projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6cf9149) | patch
Retire 'stupid' merge strategy
authorMiklos Vajna <vmiklos@frugalware.org>
Sat, 5 Jul 2008 14:43:51 +0000 (16:43 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 5 Jul 2008 17:43:46 +0000 (10:43 -0700)
commit51add76e92c9de9bcad3d421303b45ab488d529e
tree96d2774de499bf213ea1f1d6e33ffcf1ce4cac1etree | snapshot
parent6cf91492d9cd985e1fa65181d99d6d578d4439dccommit | diff
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>
.gitignore diff | blob | history
Makefile diff | blob | history
git-merge-stupid.sh [deleted file] blob | history
Git—the stupid content tracker