diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:23:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:23:56 -0700 |
| commit | 0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9 (patch) | |
| tree | 999ed87a9453af4848bf98a3341ceaf0801c6f95 /git-pull.sh | |
| parent | edf9d719d1d05c1eb4f652782febfdfede212648 (diff) | |
| parent | bebd2fd77d385f198017fe297a6c79e26b2bf61c (diff) | |
| download | git-0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9.tar.gz git-0ce6a51b43815a34d0dbebaa799b32a83d1ea4f9.tar.xz | |
Merge branch 'jk/merge-rename-ux'
* jk/merge-rename-ux:
pull: propagate --progress to merge
merge: enable progress reporting for rename detection
add inexact rename detection progress infrastructure
commit: stop setting rename limit
bump rename limit defaults (again)
merge: improve inexact rename limit warning
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 f6b7b8404..63b063a7b 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" |