projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow finding things that begin with a dash in 'git grep'
[git.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index
55b0c72
..
a784e0f
100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-14,7
+14,7
@@
usage () {
# all_strategies='resolve fredrik stupid octopus'
# all_strategies='resolve fredrik stupid octopus'
-all_strategies='
resolve octopus
stupid'
+all_strategies='
fredrik octopus resolve
stupid'
default_strategies='resolve octopus'
use_strategies=
default_strategies='resolve octopus'
use_strategies=