Merge branch 'ph/pull-rebase-detached'
authorJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:00:06 +0000 (08:00 -0500)
committerJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:00:06 +0000 (08:00 -0500)
commit4f101a6cf41da743e40e83d045455f8c180dde88
tree90aa39fdc1eba3261e2ed98efd5c37dec6005a82
parent6d3f2906a099cbde67e5084c80c8b5e6cf16e024
parente980765c59c173e9a10ce1069c763645b87fd50c
Merge branch 'ph/pull-rebase-detached'

Avoids spewing error messages when using "pull --rebase" on a
detached HEAD.

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