projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid wasting memory while keeping track of what we have during fetch.
[git.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index
55b0c72
..
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='re
solve octopus
stupid'
+all_strategies='re
cursive octopus resolve
stupid'
default_strategies='resolve octopus'
use_strategies=
default_strategies='resolve octopus'
use_strategies=
@@
-43,7
+43,7
@@
do
case "$#,$1" in
*,*=*)
strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
case "$#,$1" in
*,*=*)
strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
-
0
,*)
+
1
,*)
usage ;;
*)
strategy="$2"
usage ;;
*)
strategy="$2"