diff options
| author | Tay Ray Chuan <rctay89@gmail.com> | 2010-02-24 20:50:28 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-24 08:35:45 -0800 |
| commit | 9839018e874d4f15e820e1272f1ac575186c4fdc (patch) | |
| tree | 5de72f32c6cf95ef5a87a6c8043ac3a9caf157cc /git-pull.sh | |
| parent | 7838106925653e02b5c00ccb47a240c4c837c0f6 (diff) | |
| download | git-9839018e874d4f15e820e1272f1ac575186c4fdc.tar.gz | |
fetch and pull: learn --progress
Note that in the documentation for git-pull, documentation for the
--progress option is displayed under the "Options related to fetching"
subtitle via fetch-options.txt.
Also, update the documentation of the -q/--quiet option for git-pull to
mention its effect on progress reporting during fetching.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh index 38331a8611..d45b50cf47 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -38,7 +38,7 @@ test -z "$(git ls-files -u)" || die_conflict test -f "$GIT_DIR/MERGE_HEAD" && die_merge strategy_args= diffstat= no_commit= squash= no_ff= ff_only= -log_arg= verbosity= +log_arg= verbosity= progress= merge_args= curr_branch=$(git symbolic-ref -q HEAD) curr_branch_short=$(echo "$curr_branch" | sed "s|refs/heads/||") @@ -50,6 +50,8 @@ do verbosity="$verbosity -q" ;; -v|--verbose) verbosity="$verbosity -v" ;; + --progress) + progress=--progress ;; -n|--no-stat|--no-summary) diffstat=--no-stat ;; --stat|--summary) @@ -214,7 +216,7 @@ test true = "$rebase" && { done } orig_head=$(git rev-parse -q --verify HEAD) -git fetch $verbosity --update-head-ok "$@" || exit 1 +git fetch $verbosity $progress --update-head-ok "$@" || exit 1 curr_head=$(git rev-parse -q --verify HEAD) if test -n "$orig_head" && test "$curr_head" != "$orig_head" |