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

From

Fredrik Kuivinen <freku045@student.liu.se>

Date

Sep 13, 2005, 06:22 UTC

Message-ID

<20050913062226.GA9101@c165.ib.student.liu.se>

In-Reply-To

<7v1x3u7xtk.fsf@assigned-by-dhcp.cox.net>

On Mon, Sep 12, 2005 at 02:58:31PM -0700, Junio C Hamano wrote:

> Thanks.  Will apply.
> 
> One request before we hit 0.99.7 (this Saturday) when the name
> will be cast in stone is to christen it better than 'fredrik'
> which was what I did as a tentative measure.  Otherwise we would
> regret when you come up with another merge algorithm with
> different pros-and-cons with the current one.

- Fredrik

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>

---

 .gitignore             |    2 +-
 Makefile               |    2 +-
 git-merge-recursive.py |    0 
 git-merge.sh           |    4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename git-merge-fredrik.py => git-merge-recursive.py (100%)

7d5637d2df86406b4f8f3f96cbea57d977231470

diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -43,10 +43,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
--- 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
--- 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=