diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | git-merge-recursive.py (renamed from git-merge-fredrik.py) | 0 | ||||
| -rwxr-xr-x | git-merge.sh | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index cc2b29ebf..31c03f468 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 @@ -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 27b84867b..27b84867b 100755 --- a/git-merge-fredrik.py +++ b/git-merge-recursive.py diff --git a/git-merge.sh b/git-merge.sh index e51e73499..818e6b772 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= |