git-cvsexportcommit.perl: Fix usage() output.

[git.git] / git-pull.sh

diff --git a/git-pull.sh b/git-pull.sh
index 2358af62d5eb008ef3d04de67cea7a56aab16526..3b875ad438c21df50c0b1f26bc8fac5ab1bc9740 100755 (executable)
--- 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