Merge branch 'mz/pull-rebase-rebased'

* mz/pull-rebase-rebased:
  Use reflog in 'pull --rebase . foo'

diff --combined git-parse-remote.sh
index 4da72aefbd226f6f42af381b5d5a5a3178414576,375a0ba59e1e2491ddcd0f8970699b1f11981565..1cc2ba6e09614fa55ad205145a3bdacfb78bf283
--- 1/git-parse-remote.sh
--- 2/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@@ -66,7 -66,7 +66,7 @@@ get_remote_merge_branch () 
            origin="$1"
            default=$(get_default_remote)
            test -z "$origin" && origin=$default
 -          curr_branch=$(git symbolic-ref -q HEAD)
 +          curr_branch=$(git symbolic-ref -q HEAD) &&
            [ "$origin" = "$default" ] &&
            echo $(git for-each-ref --format='%(upstream)' $curr_branch)
            ;;
@@@ -89,7 -89,13 +89,13 @@@
            refs/heads/*) remote=${remote#refs/heads/} ;;
            refs/* | tags/* | remotes/* ) remote=
            esac
- 
-           [ -n "$remote" ] && echo "refs/remotes/$repo/$remote"
+           [ -n "$remote" ] && case "$repo" in
+               .)
+                   echo "refs/heads/$remote"
+                   ;;
+               *)
+                   echo "refs/remotes/$repo/$remote"
+                   ;;
+           esac
        esac
  }