Merge branch 'ph/pull-rebase-detached' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2012 03:33:45 +0000 (19:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2012 03:33:45 +0000 (19:33 -0800)
commit611addf8900efc19a859f3f0afc680fe53831527
treeaae4dc0ea965dde90a10dbebf284dc5116391232
parent78ba7e267caaa696746243888db363f83a061b61
parente980765c59c173e9a10ce1069c763645b87fd50c
Merge branch 'ph/pull-rebase-detached' into maint

"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