| commit | 73d9d14c037055c674779c1538fc7bfddf428db0 | |
| author | Jeff King <peff@peff.net> | |
| Thu, 25 Oct 2012 11:18:32 +0000 (25 07:18 -0400) | ||
| committer | Jeff King <peff@peff.net> | |
| Thu, 25 Oct 2012 11:18:32 +0000 (25 07:18 -0400) | ||
| tree | bc5a01449da9e2cb48b60061e2a492d69f5214ac | treesnapshot (tar.gz zip) |
| parent | 233df0875a1a4a2c38a8091da1058cf2035d19a6 | commitdiff |
| parent | e980765c59c173e9a10ce1069c763645b87fd50c | commitdiff |
Merge branch 'ph/pull-rebase-detached' into next
Do not spew error messages when using "pull --rebase" on a
detached HEAD.
* ph/pull-rebase-detached:
git-pull: Avoid merge-base on detached head
Do not spew error messages when using "pull --rebase" on a
detached HEAD.
* ph/pull-rebase-detached:
git-pull: Avoid merge-base on detached head