projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
[git.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index
e51e734
..
818e6b7
100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-12,9
+12,9
@@
usage () {
die "git-merge [-n] [-s <strategy>]... <merge-message> <head> <remote>+"
}
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=
default_strategies='resolve octopus'
use_strategies=