]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 741a694 95c38fb)
Merge branch 'jk/branch-shortening-funny-symrefs'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Apr 2016 17:49:14 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Apr 2016 17:49:14 +0000 (10:49 -0700)
commitf5cc6129166e8f419cc9ad83136c30a983a94c15
treeec05bc7ae3f97b6db6df189513c2774b634c4cd5tree | snapshot
parent741a6942eb241dfc1317b7692381fc41dbb92501commit | diff
parent95c38fb0ed45d9eb529afeb704b840818ba3da4dcommit | diff
Merge branch 'jk/branch-shortening-funny-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 | blob | history
Unnamed repository; edit this file 'description' to name the repository.