diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-10-04 12:03:05 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-04 12:04:47 +0900 |
| commit | aebd23506ec952c1ca68d577afc59d3e2f7bd7ce (patch) | |
| tree | 26f8c0cb722c3a993f958aa06fce7eaf76794345 /Documentation/git-merge.txt | |
| parent | t7301: use test_terminal to check color (diff) | |
| parent | color: make "always" the same as "auto" in config (diff) | |
| download | tgif-aebd23506ec952c1ca68d577afc59d3e2f7bd7ce.tar.xz | |
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
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions