Merge branch 'mz/rebase-abort-reflog-fix' into maint

* mz/rebase-abort-reflog-fix:
rebase --abort: do not update branch ref

diff --combined git-rebase.sh
index ec08f9cff515995b5aff972d6ccc16df5eea4507,7c38c00a1e624553044512cdb737595bd66a46d6..6a7e5e0b1884358566544cc8cd0d94c941dac5fc
--- 1/git-rebase.sh
--- 2/git-rebase.sh
+++ b/git-rebase.sh
@@@ -49,8 -49,7 +49,8 @@@ do_merge
  dotest="$GIT_DIR"/rebase-merge
  prec=4
  verbose=
 -diffstat=$(git config --bool rebase.stat)
 +diffstat=
 +test "$(git config --bool rebase.stat)" = true && diffstat=t
  git_am_opt=
  rebase_root=
  force_rebase=
@@@ -275,15 -274,16 +275,16 @@@ d
                        die "No rebase in progress?"
  
                git rerere clear
-               if test -d "$dotest"
-               then
-                       GIT_QUIET=$(cat "$dotest/quiet")
-                       move_to_original_branch
-               else
-                       dotest="$GIT_DIR"/rebase-apply
-                       GIT_QUIET=$(cat "$dotest/quiet")
-                       move_to_original_branch
-               fi
+ 
+               test -d "$dotest" || dotest="$GIT_DIR"/rebase-apply
+ 
+               head_name="$(cat "$dotest"/head-name)" &&
+               case "$head_name" in
+               refs/*)
+                       git symbolic-ref HEAD $head_name ||
+                       die "Could not move back to $head_name"
+                       ;;
+               esac
                git reset --hard $(cat "$dotest/orig-head")
                rm -r "$dotest"
                exit