[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.

Otherwise we would regret when Fredrik comes up with another merge algorithm with different pros-and-cons with the current one. Signed-off-by: N Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: N Junio C Hamano <junkio@cox.net>

[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
Otherwise we would regret when Fredrik comes up with another merge algorithm with different pros-and-cons with the current one. Signed-off-by: N Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: N Junio C Hamano <junkio@cox.net>
e4cf17ce · Fredrik Kuivinen · Junio C Hamano · f88ed172 · e4cf17ce · e4cf17ce
隐藏空白更改
内联并排

Showing with 4 addition and 4 deletion

.gitignore .gitignore +1 -1

Makefile Makefile +1 -1

git-merge-recursive.py git-merge-recursive.py +0 -0

git-merge.sh git-merge.sh +2 -2

未找到文件。
--- 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

--- 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 = \

--- a/git-merge-fredrik.py
+++ b/git-merge-fredrik.py
--- 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=