diff options
| author | Jeff King <peff@peff.net> | 2011-02-20 04:56:56 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-21 10:24:10 -0800 |
| commit | bebd2fd77d385f198017fe297a6c79e26b2bf61c (patch) | |
| tree | bb19b5bfdf9aebe8879864b0b3561d2c7c1b4d4e | |
| parent | 99bfc6691d79eaffaaf170a8b6584bcfe97863dc (diff) | |
| download | git-bebd2fd77d385f198017fe297a6c79e26b2bf61c.tar.gz git-bebd2fd77d385f198017fe297a6c79e26b2bf61c.tar.xz | |
pull: propagate --progress to merge
Now that merge understands progress, we should pass it
along. While we're at it, pass along --no-progress, too.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 eb87f4906..5e8215ca7 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -53,6 +53,8 @@ do verbosity="$verbosity -v" ;; --progress) progress=--progress ;; + --no-progress) + progress=--no-progress ;; -n|--no-stat|--no-summary) diffstat=--no-stat ;; --stat|--summary) @@ -293,8 +295,8 @@ true) ;; *) eval="git-merge $diffstat $no_commit $squash $no_ff $ff_only" - eval="$eval $log_arg $strategy_args $merge_args" - eval="$eval \"\$merge_name\" HEAD $merge_head $verbosity" + eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress" + eval="$eval \"\$merge_name\" HEAD $merge_head" ;; esac eval "exec $eval" |