summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-11 14:23:49 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-11 14:23:49 -0700
commit352618287e469889c85da4f2fd32c03d5ac2f3dc (patch)
tree5991959b6ceb5b838875ae2d8aae6c9520bd444c
parent04959836795da4c82bc9b12bebdfb294ea12943f (diff)
parent22946a942627d67b09a9630a036e48ce2823cd0c (diff)
downloadgit-352618287e469889c85da4f2fd32c03d5ac2f3dc.tar.gz
Merge branch 'jk/rebase-quiet-noop'
"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-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index fb935a03f3..1757404bc2 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