diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-07-12 15:18:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-12 15:18:23 -0700 |
| commit | 768d0fe0dadbffe722fa4b80b2180a4fcaf1c854 (patch) | |
| tree | ac1c34d58d1f8f01ff655e5915fdef074c7d04ac /t/t3502-cherry-pick-merge.sh | |
| parent | Merge branch 'rs/urlmatch-cleanup' (diff) | |
| parent | ref-filter.c: drop return from void function (diff) | |
| download | tgif-768d0fe0dadbffe722fa4b80b2180a4fcaf1c854.tar.xz | |
Merge branch 'kn/ref-filter-branch-list'
The rewrite of "git branch --list" using for-each-ref's internals
that happened in v2.13 regressed its handling of color.branch.local;
this has been fixed.
* kn/ref-filter-branch-list:
ref-filter.c: drop return from void function
branch: set remote color in ref-filter branch immediately
branch: use BRANCH_COLOR_LOCAL in ref-filter format
branch: only perform HEAD check for local branches
Diffstat (limited to 't/t3502-cherry-pick-merge.sh')
0 files changed, 0 insertions, 0 deletions