#
# Fetch one or more remote refs and merge it/them into the current HEAD.
-. git-sh-setup || die "Not a git archive"
-
-usage () {
- die "git pull [-n] [--no-commit] [-s strategy]... <repo> <head>..."
-}
+USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <repo> <head>...'
+LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
+. git-sh-setup
strategy_args= no_summary= no_commit=
while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
esac
strategy_args="${strategy_args}-s $strategy "
;;
+ -h|--h|--he|--hel|--help)
+ usage
+ ;;
-*)
# Pass thru anything that is meant for fetch.
break
exit 0
;;
?*' '?*)
- strategy_default_args='-s octopus'
+ var=`git repo-config --get pull.octopus`
+ if test '' = "$var"
+ then
+ strategy_default_args='-s octopus'
+ else
+ strategy_default_args="-s $var"
+ fi
;;
*)
- strategy_default_args='-s resolve'
+ var=`git repo-config --get pull.twohead`
+ if test '' = "$var"
+ then
+ strategy_default_args='-s recursive'
+ else
+ strategy_default_args="-s $var"
+ fi
;;
esac