X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.sh;h=0991d5f14cd6d903572a041cfbfe3cde219c738f;hb=806f36d4d7caf75b6d3e098cb0353d85d3477c7d;hp=3b875ad438c21df50c0b1f26bc8fac5ab1bc9740;hpb=a1c292958f9968565f4048a17196d99fd16fc7ca;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