diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-14 17:30:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-14 17:30:03 -0800 |
| commit | 1ed91937e5cd59fdbdfa5f15f6fac132d2b21ce0 (patch) | |
| tree | f65b929c006c31043213152752ea0c80bf08b9e5 /git-pull.sh | |
| parent | a9572072f0ab0ac97e64b0dc01254a3ad95befe1 (diff) | |
| parent | 294c695d8cfbcf95a5c33fc6ba386f496964defb (diff) | |
Oh, I hate to do this but I ended up merging big usage string
cleanups from Fredrik, git-am enhancements that made a lot of
sense for non mbox users from HPA, and rebase changes (done
independently by me and Lukas) among other things, so git is
still in perpetual state of 1.0rc. 1.0 will probably be next
Wednesday, but who knows.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/git-pull.sh b/git-pull.sh index 3a139849fb..0991d5f14c 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]... [<fetch-options>] <repo> <head>...' +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-options>] - <repo> <head>... - -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 |