OSDN Git Service

Merge branch 'rr/rebase-reflog-message-reword'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Jul 2013 19:48:20 +0000 (12:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jul 2013 19:48:20 +0000 (12:48 -0700)
"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

1  2 
git-rebase--interactive.sh
git-rebase.sh
t/t3404-rebase-interactive.sh

Simple merge
diff --cc 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.")"
Simple merge