From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Oct 2017 03:03:05 +0000 (+0900)
Subject: Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto
X-Git-Tag: v2.15.0-rc1~18^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/aebd23506ec952c1ca68d577afc59d3e2f7bd7ce?hp=aebd23506ec952c1ca68d577afc59d3e2f7bd7ce

Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto

* jk/ui-color-always-to-auto-maint:
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
---