| commit | 4f101a6cf41da743e40e83d045455f8c180dde88 | |
| author | Jeff King <peff@peff.net> | |
| Sun, 4 Nov 2012 13:00:06 +0000 (4 08:00 -0500) | ||
| committer | Jeff King <peff@peff.net> | |
| Sun, 4 Nov 2012 13:00:06 +0000 (4 08:00 -0500) | ||
| tree | 90aa39fdc1eba3261e2ed98efd5c37dec6005a82 | treesnapshot (tar.gz zip) |
| parent | 6d3f2906a099cbde67e5084c80c8b5e6cf16e024 | commitdiff |
| parent | e980765c59c173e9a10ce1069c763645b87fd50c | commitdiff |
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
Avoids spewing error messages when using "pull --rebase" on a
detached HEAD.
* ph/pull-rebase-detached:
git-pull: Avoid merge-base on detached head