[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>
Fredrik Kuivinen committed
Sep 13, 2005 at 08:22 UTC
e4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0
4 files changed
+4
-4
.gitignore
+1
-1
@@ -44,10 +44,10 @@ git-mailinfo
44
git-mailsplit
45
git-merge
46
git-merge-base
47
-git-merge-fredrik
47
git-merge-index
48
git-merge-octopus
49
git-merge-one-file
50
+git-merge-recursive
51
git-merge-resolve
52
git-merge-stupid
53
git-mktag
Makefile
+1
-1
@@ -83,7 +83,7 @@ SCRIPT_PERL = \
83
git-rename.perl git-shortlog.perl
84
85
SCRIPT_PYTHON = \
86
- git-merge-fredrik.py
86
+ git-merge-recursive.py
87
88
# The ones that do not have to link with lcrypto nor lz.
89
SIMPLE_PROGRAMS = \
git-merge-recursive.py
renamed
git-merge.sh
+2
-2
@@ -12,9 +12,9 @@ usage () {
12
die "git-merge [-n] [-s <strategy>]... <merge-message> <head> <remote>+"
13
}
14
15
-# all_strategies='resolve fredrik stupid octopus'
15
+# all_strategies='resolve recursive stupid octopus'
16
17
-all_strategies='fredrik octopus resolve stupid'
17
+all_strategies='recursive octopus resolve stupid'
18
default_strategies='resolve octopus'
19
use_strategies=
20