diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-18 10:49:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-18 10:49:14 -0700 |
| commit | f5cc6129166e8f419cc9ad83136c30a983a94c15 (patch) | |
| tree | ec05bc7ae3f97b6db6df189513c2774b634c4cd5 /xdiff/xdiff.h | |
| parent | Merge branch 'ky/branch-m-worktree' (diff) | |
| parent | branch: fix shortening of non-remote symrefs (diff) | |
| download | tgif-f5cc6129166e8f419cc9ad83136c30a983a94c15.tar.xz | |
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
Diffstat (limited to 'xdiff/xdiff.h')
0 files changed, 0 insertions, 0 deletions