git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a3fa565 95c38fb)
Merge branch 'jk/branch-shortening-funny-symrefs' into maint
authorJunio C Hamano <redacted>
Mon, 2 May 2016 21:24:07 +0000 (14:24 -0700)
committerJunio C Hamano <redacted>
Mon, 2 May 2016 21:24:07 +0000 (14:24 -0700)
commit75375ea337dcd5c3dc2f8f793d7c8a3ee59f5564
tree114661f3320bd561d413e896890f5f347b10706atree | snapshot
parenta3fa5653276ed923ef079188459242f3f7e6264dcommit | diff
parent95c38fb0ed45d9eb529afeb704b840818ba3da4dcommit | diff
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
builtin/branch.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT