[PATCH] Move 'stupid' merge strategy to contrib.
- From
Miklos Vajna <vmiklos@frugalware.org>
- Date
- Jul 5, 2008, 21:00 UTC
- Message-ID
- <1215291607-20781-1-git-send-email-vmiklos@frugalware.org>
- In-Reply-To
- <1215269031-19559-1-git-send-email-vmiklos@frugalware.org>
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'.
Given that it may still serve as a good example, don't remove it, just move it to contrib/examples. ---
n Sat, Jul 05, 2008 at 04:43:51PM +0200, Miklos Vajna <vmiklos@frugalware.org> wrote:
> Here is one.
Oops, I forgot -M with format-patch.
.gitignore | 1 - Makefile | 3 +-- .../examples/git-merge-stupid.sh | 0 3 files changed, 1 insertions(+), 3 deletions(-) rename git-merge-stupid.sh => contrib/examples/git-merge-stupid.sh (100%)
diff --git a/.gitignore b/.gitignore index 4ff2fec..8054d9d 100644 --- a/.gitignore +++ b/.gitignore @@ -75,7 +75,6 @@ git-merge-one-file git-merge-ours git-merge-recursive git-merge-resolve -git-merge-stupid git-merge-subtree git-mergetool git-mktag diff --git a/Makefile b/Makefile index 78e08d3..bddd1a7 100644 --- a/Makefile +++ b/Makefile @@ -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 ; \ diff --git a/git-merge-stupid.sh b/contrib/examples/git-merge-stupid.sh similarity index 100% rename from git-merge-stupid.sh rename to contrib/examples/git-merge-stupid.sh
-- 1.5.6.1.322.ge904b.dirty