Merge branch 'ph/pull-rebase-detached' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2012 03:33:45 +0000 (18 19:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2012 03:33:45 +0000 (18 19:33 -0800)
"git pull --rebase" run while the HEAD is detached tried to find
the upstream branch of the detached HEAD (which by definition
does not exist) and emitted unnecessary error messages.

* ph/pull-rebase-detached:
  git-pull: Avoid merge-base on detached head


Trivial merge