development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Fredrik Kuivinen 2005-09-13 08:22:26 +02:00 committed by Junio C Hamano
parent f88ed172e7
commit e4cf17ce0d
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -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

2
Makefile
View file

@ -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 = \

0
git-merge-fredrik.py → git-merge-recursive.py
View file

4
git-merge.sh
View file

@ -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=