diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-10-18 10:19:08 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 10:19:08 +0900 |
| commit | 1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c (patch) | |
| tree | da278177d16ce137f6b19de518b149ba6edcbdca /oidmap.h | |
| parent | Merge branch 'js/rebase-i-final' (diff) | |
| parent | tag: respect color.ui config (diff) | |
| download | tgif-1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c.tar.xz | |
Merge branch 'jk/ref-filter-colors-fix'
This is the "theoretically more correct" approach of simply
stepping back to the state before plumbing commands started paying
attention to "color.ui" configuration variable.
Let's run with this one.
* jk/ref-filter-colors-fix:
tag: respect color.ui config
Revert "color: check color.ui in git_default_config()"
Revert "t6006: drop "always" color config tests"
Revert "color: make "always" the same as "auto" in config"
Diffstat (limited to 'oidmap.h')
0 files changed, 0 insertions, 0 deletions