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)
Avoids spewing error messages when using "pull --rebase" on a
detached HEAD.

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


Trivial merge