![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b99a394)
raw | patch | inline | side by side (parent: b99a394)
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 24 Nov 2005 00:23:11 +0000 (16:23 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 24 Nov 2005 00:23:11 +0000 (16:23 -0800) |
git-pull invoked merge with recursive as the default strategy
for some time now; match it in the git-merge itself. Also avoid
listing more than one strategy on default because we have only
one strategy that can resolve an octopus and we are already
counting heads here. This reduces the need to stash away local
modifications.
Signed-off-by: Junio C Hamano <junkio@cox.net>
for some time now; match it in the git-merge itself. Also avoid
listing more than one strategy on default because we have only
one strategy that can resolve an octopus and we are already
counting heads here. This reduces the need to stash away local
modifications.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge.sh | patch | blob | history |
diff --git a/git-merge.sh b/git-merge.sh
index 7f481e4caacf295635f1fb69c9b4f1c364355234..255476e2deda1e5c7f9654fd92ba9d1950b1a3b7 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
die "git-merge [-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+"
}
-# all_strategies='resolve recursive stupid octopus'
-
all_strategies='recursive octopus resolve stupid ours'
-default_strategies='resolve octopus'
+default_strategies='recursive'
use_strategies=
dropsave() {
shift
done
-case "$use_strategies" in
-'')
- use_strategies=$default_strategies
- ;;
-esac
test "$#" -le 2 && usage ;# we need at least two heads.
merge_msg="$1"
;;
esac
+case "$use_strategies" in
+'')
+ case "$#" in
+ 1)
+ use_strategies="$default_strategies" ;;
+ *)
+ use_strategies=octopus ;;
+ esac
+ ;;
+esac
+
# At this point, we need a real merge. No matter what strategy
# we use, it would operate on the index, possibly affecting the
# working tree, and when resolved cleanly, have the desired tree