X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.sh;h=6caf1aad471bbf8f894ea20a80c3be082012648b;hb=664368886781b7c070233c002597b84628eec571;hp=3a139849fbfc545b7c479dd2889a0285fab646d5;hpb=56fc63193975edd4b9f520b6c65c2b97ecd8ee38;p=git.git diff --git a/git-pull.sh b/git-pull.sh index 3a139849..6caf1aad 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -4,19 +4,10 @@ # # Fetch one or more remote refs and merge it/them into the current HEAD. +USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [] ...' +LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.' . git-sh-setup -usage () { - echo >&2 "usage: $0"' [-n] [--no-commit] [--no-summary] [--help] - [-s strategy]... - [] - ... - -Fetch one or more remote refs and merge it/them into the current HEAD. -' - exit 1 -} - strategy_args= no_summary= no_commit= while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac do @@ -79,21 +70,21 @@ case "$merge_head" in exit 0 ;; ?*' '?*) - var=`git-var -l | sed -ne 's/^pull\.octopus=/-s /p'` + var=`git repo-config --get pull.octopus` if test '' = "$var" then strategy_default_args='-s octopus' else - strategy_default_args=$var + strategy_default_args="-s $var" fi ;; *) - var=`git-var -l | sed -ne 's/^pull\.twohead=/-s /p'` + var=`git repo-config --get pull.twohead` if test '' = "$var" then strategy_default_args='-s recursive' else - strategy_default_args=$var + strategy_default_args="-s $var" fi ;; esac