diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-26 13:49:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-26 13:49:23 -0700 |
| commit | 5d5343386414d6097cdba797c88e3bc043dc0074 (patch) | |
| tree | d251a9056d83974800e8fae475710e1a90d76954 | |
| parent | 23903b9e290afeb6928955ee589799ee1a3c4c73 (diff) | |
| parent | 22946a942627d67b09a9630a036e48ce2823cd0c (diff) | |
| download | git-5d5343386414d6097cdba797c88e3bc043dc0074.tar.gz | |
Merge branch 'jk/rebase-quiet-noop' into maint
"git rebase --quiet" was not quite quiet when there is nothing to
do.
* jk/rebase-quiet-noop:
rebase: silence "git checkout" for noop rebase
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 55da9db818..90854e38cb 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -582,7 +582,7 @@ then # Lazily switch to the target branch if needed... test -z "$switch_to" || GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \ - git checkout "$switch_to" -- + git checkout -q "$switch_to" -- say "$(eval_gettext "Current branch \$branch_name is up to date.")" finish_rebase exit 0 |