summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile2
-rwxr-xr-xgit-merge-recursive.py (renamed from git-merge-fredrik.py)0
-rwxr-xr-xgit-merge.sh4
4 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index cc2b29ebfc..31c03f468b 100644
--- 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 9c2bdd642b..a851f56466 100644
--- 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
index 27b84867b0..27b84867b0 100755
--- a/git-merge-fredrik.py
+++ b/git-merge-recursive.py
diff --git a/git-merge.sh b/git-merge.sh
index e51e73499a..818e6b772d 100755
--- 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=