X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-pull.sh;h=0991d5f14cd6d903572a041cfbfe3cde219c738f;hb=8e76c79f4a1e66ed8e371d1232e879f45141dce1;hp=3b875ad438c21df50c0b1f26bc8fac5ab1bc9740;hpb=8fc66df237afce0b4318657f166b3583831949f3;p=git.git diff --git a/git-pull.sh b/git-pull.sh index 3b875ad4..0991d5f1 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -4,18 +4,9 @@ # # Fetch one or more remote refs and merge it/them into the current HEAD. -. git-sh-setup || die "Not a git archive" - -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 -} +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 strategy_args= no_summary= no_commit= while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac