summaryrefslogtreecommitdiffstats
path: root/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-20 16:39:43 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-20 16:39:43 -0700
commitfa1d3497321981b9cbbc1a8bf499c613e951c9a6 (patch)
tree78155be1436a8514da53fd6b27579a3cefa547dd /config.txt
parent76e160bf877d950a4148f088b75fca0b4859427d (diff)
downloadgit-htmldocs-fa1d3497321981b9cbbc1a8bf499c613e951c9a6.tar.gz
Autogenerated HTML docs for v1.8.3.1-484-g21ff91
Diffstat (limited to 'config.txt')
-rw-r--r--config.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/config.txt b/config.txt
index 7fd4035cb..311fcebaf 100644
--- a/config.txt
+++ b/config.txt
@@ -919,11 +919,12 @@ color.ui::
as `color.diff` and `color.grep` that control the use of color
per command family. Its scope will expand as more commands learn
configuration to set a default for the `--color` option. Set it
- to `always` if you want all output not intended for machine
- consumption to use color, to `true` or `auto` if you want such
- output to use color when written to the terminal, or to `false` or
- `never` if you prefer Git commands not to use color unless enabled
- explicitly with some other configuration or the `--color` option.
+ to `false` or `never` if you prefer Git commands not to use
+ color unless enabled explicitly with some other configuration
+ or the `--color` option. Set it to `always` if you want all
+ output not intended for machine consumption to use color, to
+ `true` or `auto` (this is the default since Git 1.8.4) if you
+ want such output to use color when written to the terminal.
column.ui::
Specify whether supported commands should output in columns.