X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=7f481e4caacf295635f1fb69c9b4f1c364355234;hb=f98d863d2122e1b8781dfb9889df98876a26f315;hp=dd104db7ad5991543b1156e142173e40b0ff05bc;hpb=123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index dd104db7..7f481e4c 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -14,7 +14,7 @@ usage () {
 
 # all_strategies='resolve recursive stupid octopus'
 
-all_strategies='recursive octopus resolve stupid'
+all_strategies='recursive octopus resolve stupid ours'
 default_strategies='resolve octopus'
 use_strategies=
 
@@ -110,7 +110,14 @@ do
 	    die "$remote - not something we can merge"
 done
 
-common=$(git-show-branch --merge-base $head "$@")
+case "$#" in
+1)
+	common=$(git-merge-base --all $head "$@")
+	;;
+*)
+	common=$(git-show-branch --merge-base $head "$@")
+	;;
+esac
 echo "$head" >"$GIT_DIR/ORIG_HEAD"
 
 case "$#,$common,$no_commit" in
@@ -162,7 +169,7 @@ case "$#,$common,$no_commit" in
 	up_to_date=t
 	for remote
 	do
-		common_one=$(git-merge-base $head $remote)
+		common_one=$(git-merge-base --all $head $remote)
 		if test "$common_one" != "$remote"
 		then
 			up_to_date=f