[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: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
git-mirror · Sep 13, 2005 · e4cf17c · e4cf17c
1 parent f88ed17
commit e4cf17c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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 → git-merge-recursive.py b/git-merge-fredrik.py → git-merge-recursive.py
diff --git 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=