X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.sh;h=3b875ad438c21df50c0b1f26bc8fac5ab1bc9740;hb=10bea152a34b2bf1194ede5e0c9e5595ab2100f3;hp=2358af62d5eb008ef3d04de67cea7a56aab16526;hpb=93d69d86912c44206543f6670e93f9fc6f2f859f;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
old mode 100644
new mode 100755
index 2358af62..3b875ad4
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -79,10 +79,22 @@ case "$merge_head" in
 	exit 0
 	;;
 ?*' '?*)
-	strategy_default_args='-s octopus'
+	var=`git-var -l | sed -ne 's/^pull\.octopus=/-s /p'`
+	if test '' = "$var"
+	then
+		strategy_default_args='-s octopus'
+	else
+		strategy_default_args=$var
+	fi
 	;;
 *)
-	strategy_default_args='-s resolve'
+	var=`git-var -l | sed -ne 's/^pull\.twohead=/-s /p'`
+	if test '' = "$var"
+	then
+		strategy_default_args='-s recursive'
+	else
+		strategy_default_args=$var
+	fi
 	;;
 esac