diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:58:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:58:34 -0700 |
| commit | a8aa360017e80b9537058caffa53b573df783cae (patch) | |
| tree | 71fe730a595ff9e515fa814dccc35aa75218f9b7 /git-pull.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | pull: Apply -q and -v options to rebase mode as well (diff) | |
| download | git-a8aa360017e80b9537058caffa53b573df783cae.tar.gz git-a8aa360017e80b9537058caffa53b573df783cae.zip | |
Merge branch 'pe/pull-rebase-v-q'
Teach "git pull --rebase" to pass "-v/-q" command line options to
underlying "git rebase".
* pe/pull-rebase-v-q:
pull: Apply -q and -v options to rebase mode as well
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index 266e682f6c..5d97e97bd9 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -279,7 +279,7 @@ fi merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit case "$rebase" in true) - eval="git-rebase $diffstat $strategy_args $merge_args" + eval="git-rebase $diffstat $strategy_args $merge_args $verbosity" eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}" ;; *) |