X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.sh;h=2358af62d5eb008ef3d04de67cea7a56aab16526;hb=93d69d86912c44206543f6670e93f9fc6f2f859f;hp=e23d4f559790fed079bb5759fd5aa11a8804f191;hpb=90279074ca5cc336a8bfffd47d19d089b291b432;p=git.git diff --git a/git-pull.sh b/git-pull.sh old mode 100755 new mode 100644 index e23d4f55..2358af62 --- a/git-pull.sh +++ b/git-pull.sh @@ -7,7 +7,14 @@ . git-sh-setup || die "Not a git archive" usage () { - die "git pull [-n] [--no-commit] [-s strategy]... ..." + 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= @@ -33,6 +40,9 @@ do esac strategy_args="${strategy_args}-s $strategy " ;; + -h|--h|--he|--hel|--help) + usage + ;; -*) # Pass thru anything that is meant for fetch. break