| commit | 75375ea337dcd5c3dc2f8f793d7c8a3ee59f5564 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 May 2016 21:24:07 +0000 (2 14:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 May 2016 21:24:07 +0000 (2 14:24 -0700) | ||
| tree | 114661f3320bd561d413e896890f5f347b10706a | treesnapshot (tar.gz zip) |
| parent | a3fa5653276ed923ef079188459242f3f7e6264d | commitdiff |
| parent | 95c38fb0ed45d9eb529afeb704b840818ba3da4d | commitdiff |
Merge branch 'jk/branch-shortening-funny-symrefs' into maint
A change back in version 2.7 to "git branch" broke display of a
symbolic ref in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).
* jk/branch-shortening-funny-symrefs:
branch: fix shortening of non-remote symrefs
A change back in version 2.7 to "git branch" broke display of a
symbolic ref in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).
* jk/branch-shortening-funny-symrefs:
branch: fix shortening of non-remote symrefs
| builtin/branch.c | diff1 | diff2 | blobhistory |