Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maint

* uk/maint-1.5.3-rebase-i-reflog:
  rebase--interactive: remote stray closing parenthesis

Conflicts:
	git-rebase--interactive.sh

diff --cc git-rebase--interactive.sh
index 314cd364b8f4df5e170dd0ffd9e874b3e6c2737c,70cb2e30b4b7b3f3c3cf5ccef1d63b843bc46944..f96d887d23653019e3387eced2779d50b3f09fa2
--- 1/git-rebase--interactive.sh
--- 2/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -418,18 -156,10 +418,18 @@@ do_next () 
        OLDHEAD=$(cat "$DOTEST"/head) &&
        SHORTONTO=$(git rev-parse --short $(cat "$DOTEST"/onto)) &&
        NEWHEAD=$(git rev-parse HEAD) &&
 -      message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO" &&
 -      git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
 -      git symbolic-ref HEAD $HEADNAME &&
 +      case $HEADNAME in
 +      refs/*)
-               message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
++              message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO" &&
 +              git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
 +              git symbolic-ref HEAD $HEADNAME
 +              ;;
 +      esac && {
 +              test ! -f "$DOTEST"/verbose ||
 +                      git diff-tree --stat $(cat "$DOTEST"/head)..HEAD
 +      } &&
        rm -rf "$DOTEST" &&
 +      git gc --auto &&
        warn "Successfully rebased and updated $HEADNAME."
  
        exit