From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Jul 2013 19:48:20 +0000 (-0700)
Subject: Merge branch 'rr/rebase-reflog-message-reword'
X-Git-Tag: v1.8.4-rc0~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afbfcaa98396de66e42dc3c845f396c5ba508ced;p=thirdparty%2Fgit.git

Merge branch 'rr/rebase-reflog-message-reword'

"git rebase [-i]" used to leave just "rebase" as its reflog message
for some operations. This rewords them to be more informative.

* rr/rebase-reflog-message-reword:
  rebase -i: use a better reflog message
  rebase: use a better reflog message
---

afbfcaa98396de66e42dc3c845f396c5ba508ced
diff --cc git-rebase.sh
index 81b0346a5d,79f526eb9a..0039ecfb40
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@@ -542,9 -497,10 +542,11 @@@ the
  	if test -z "$force_rebase"
  	then
  		# Lazily switch to the target branch if needed...
- 		test -z "$switch_to" || git checkout "$switch_to" --
+ 		test -z "$switch_to" ||
+ 		GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \
+ 			git checkout "$switch_to" --
  		say "$(eval_gettext "Current branch \$branch_name is up to date.")"
 +		finish_rebase
  		exit 0
  	else
  		say "$(eval_gettext "Current branch \$branch_name is up to date, rebase forced.")"