diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-07-05 14:43:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-05 17:43:46 (GMT) |
| commit | 51add76e92c9de9bcad3d421303b45ab488d529e (patch) | |
| tree | 96d2774de499bf213ea1f1d6e33ffcf1ce4cac1e /Makefile | |
| parent | 6cf91492d9cd985e1fa65181d99d6d578d4439dc (diff) | |
| download | git-51add76e92c9de9bcad3d421303b45ab488d529e.zip git-51add76e92c9de9bcad3d421303b45ab488d529e.tar.gz git-51add76e92c9de9bcad3d421303b45ab488d529e.tar.bz2 | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -241,7 +241,6 @@ SCRIPT_SH += git-merge-octopus.sh SCRIPT_SH += git-merge-one-file.sh SCRIPT_SH += git-merge-resolve.sh SCRIPT_SH += git-merge.sh -SCRIPT_SH += git-merge-stupid.sh SCRIPT_SH += git-mergetool.sh SCRIPT_SH += git-parse-remote.sh SCRIPT_SH += git-pull.sh @@ -1429,7 +1428,7 @@ check-docs:: do \ case "$$v" in \ git-merge-octopus | git-merge-ours | git-merge-recursive | \ - git-merge-resolve | git-merge-stupid | git-merge-subtree | \ + git-merge-resolve | git-merge-subtree | \ git-fsck-objects | git-init-db | \ git-?*--?* ) continue ;; \ esac ; \ |