| commit | 433d62fea95fccdd57a81641618f61544d699126 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Oct 2017 06:08:31 +0000 (17 15:08 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Oct 2017 06:08:31 +0000 (17 15:08 +0900) | ||
| tree | bddf17ab7322486642d7aeb206005d7c1c6d0831 | treesnapshot (tar.gz zip) |
| parent | 4010f1d1b782eb7585e0e0abcefa794bd5ff29a0 | commitdiff |
| parent | 6be4595edb8e5b616c6e8b9fbc78b0f831fa2a87 | commitdiff |
Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filter-colors-fix-maint
* 'jk/ui-color-always-to-auto-maint' (early part):
color: make "always" the same as "auto" in config
provide --color option for all ref-filter users
t3205: use --color instead of color.branch=always
t3203: drop "always" color test
t6006: drop "always" color config tests
t7502: use diff.noprefix for --verbose test
t7508: use test_terminal for color output
t3701: use test-terminal to collect color output
t4015: prefer --color to -c color.diff=always
test-terminal: set TERM=vt100
* 'jk/ui-color-always-to-auto-maint' (early part):
color: make "always" the same as "auto" in config
provide --color option for all ref-filter users
t3205: use --color instead of color.branch=always
t3203: drop "always" color test
t6006: drop "always" color config tests
t7502: use diff.noprefix for --verbose test
t7508: use test_terminal for color output
t3701: use test-terminal to collect color output
t4015: prefer --color to -c color.diff=always
test-terminal: set TERM=vt100