summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-21 00:13:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-21 00:13:56 (GMT)
commitb23b27eb5dc950081d4f76ae84f10168c4d149bd (patch)
tree6e29309bd8f2ae4b200214a0d2257aa1bc909515 /Documentation
parent6fe870f032e4a247cdcf2949bb24d103873ff597 (diff)
parent6b2f2d9805dd22c6f74957e0d76a1d2921b40c16 (diff)
downloadgit-b23b27eb5dc950081d4f76ae84f10168c4d149bd.zip
git-b23b27eb5dc950081d4f76ae84f10168c4d149bd.tar.gz
git-b23b27eb5dc950081d4f76ae84f10168c4d149bd.tar.bz2
Merge branch 'mk/color'
* mk/color: Add color.ui variable which globally enables colorization if set
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index f2f6a77..7b67671 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -489,6 +489,13 @@ color.status.<slot>::
commit.template::
Specify a file to use as the template for new commit messages.
+color.ui::
+ When set to `always`, always use colors in all git commands which
+ are capable of colored output. When false (or `never`), never. When
+ set to `true` or `auto`, use colors only when the output is to the
+ terminal. When more specific variables of color.* are set, they always
+ take precedence over this setting. Defaults to false.
+
diff.autorefreshindex::
When using `git diff` to compare with work tree
files, do not consider stat-only change as changed.