diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-09-13 08:22:26 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-13 00:20:54 -0700 |
| commit | e4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0 (patch) | |
| tree | e311046e26ff830a2232067e6ad00ba06db95e2d /git-merge.sh | |
| parent | f88ed172e7a391bd907798ad2a3347a83cd24317 (diff) | |
| download | git-e4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0.tar.gz | |
[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>
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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= |