My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f88ed17)
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
authorFredrik Kuivinen <freku045@student.liu.se>
Tue, 13 Sep 2005 06:22:26 +0000 (08:22 +0200)
committerJunio C Hamano <junkio@cox.net>
Tue, 13 Sep 2005 07:20:54 +0000 (00:20 -0700)
Otherwise we would regret when Fredrik comes up with another merge
algorithm with different pros-and-cons with the current one.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
.gitignore patch | blob | history
Makefile patch | blob | history
git-merge-recursive.py [moved from git-merge-fredrik.py with 100% similarity] patch | blob | history
git-merge.sh patch | blob | history

diff --git a/.gitignore b/.gitignore
index cc2b29e..31c03f4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -44,10 +44,10 @@ git-mailinfo
 git-mailsplit
 git-merge
 git-merge-base
-git-merge-fredrik
 git-merge-index
 git-merge-octopus
 git-merge-one-file
+git-merge-recursive
 git-merge-resolve
 git-merge-stupid
 git-mktag
diff --git a/Makefile b/Makefile
index 9c2bdd6..a851f56 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ SCRIPT_PERL = \
        git-rename.perl git-shortlog.perl
 
 SCRIPT_PYTHON = \
-       git-merge-fredrik.py
+       git-merge-recursive.py
 
 # The ones that do not have to link with lcrypto nor lz.
 SIMPLE_PROGRAMS = \
diff --git a/git-merge-fredrik.py b/git-merge-recursive.py
similarity index 100%
rename from git-merge-fredrik.py
rename to git-merge-recursive.py
diff --git a/git-merge.sh b/git-merge.sh
index e51e734..818e6b7 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -12,9 +12,9 @@ usage () {
     die "git-merge [-n] [-s <strategy>]... <merge-message> <head> <remote>+"
 }
 
-# all_strategies='resolve fredrik stupid octopus'
+# all_strategies='resolve recursive stupid octopus'
 
-all_strategies='fredrik octopus resolve stupid'
+all_strategies='recursive octopus resolve stupid'
 default_strategies='resolve octopus'
 use_strategies=
 
The core git plumbing