X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=0991d5f14cd6d903572a041cfbfe3cde219c738f;hb=bd6a9e885aec97999041307b76d73de4605f25db;hp=3a139849fbfc545b7c479dd2889a0285fab646d5;hpb=93dcab2937624ebb97f91807576cddb242a55a46;p=git.git diff --git a/git-pull.sh b/git-pull.sh index 3a139849f..0991d5f14 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