Skip to content

Commit

Permalink
Merge branch 'jk/rebase-quiet-noop' into maint
Browse files Browse the repository at this point in the history
"git rebase --quiet" was not quite quiet when there is nothing to
do.

* jk/rebase-quiet-noop:
  rebase: silence "git checkout" for noop rebase
  • Loading branch information
Junio C Hamano committed May 26, 2015
2 parents 23903b9 + 22946a9 commit 5d53433
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-rebase.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 5d53433

Please sign in to comment.