diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-12 22:23:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-12 22:23:09 (GMT) |
| commit | 55bdfa022f007b5666d923012296f04872a8f3d9 (patch) | |
| tree | 3f4eb9c2a3ea2c1603517904d0a731d1e1375ee1 /git-difftool--helper.sh | |
| parent | ecab58c65f5915869fd84a57e1060e146aaa0be3 (diff) | |
| parent | 5b5c9c3e19eb6afcb987093c705bb5e2e80a63ae (diff) | |
| download | git-55bdfa022f007b5666d923012296f04872a8f3d9.zip git-55bdfa022f007b5666d923012296f04872a8f3d9.tar.gz git-55bdfa022f007b5666d923012296f04872a8f3d9.tar.bz2 | |
Merge branch 'kn/ref-filter-branch-list' into maint
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 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions