summaryrefslogtreecommitdiffstats
path: root/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-02 13:50:19 -0800
committerJunio C Hamano <gitster@pobox.com>2017-02-02 13:50:19 -0800
commitb86c803928ea5a49233f14d6f92c7ce64760e309 (patch)
treeb53e78dbcd137b5e0da46cbf62d8075c60119db2 /config.txt
parentc05f739ccf383e9a1515bc25b3fd96f673df83b9 (diff)
downloadgit-htmldocs-b86c803928ea5a49233f14d6f92c7ce64760e309.tar.gz
Autogenerated HTML docs for v2.11.1-431-g8a8f12
Diffstat (limited to 'config.txt')
-rw-r--r--config.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/config.txt b/config.txt
index af2ae4cc0..fc78139c2 100644
--- a/config.txt
+++ b/config.txt
@@ -170,6 +170,9 @@ The position of any attributes with respect to the colors
be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`,
`no-ul`, etc).
+
+An empty color string produces no color effect at all. This can be used
+to avoid coloring specific elements without disabling color entirely.
++
For git's pre-defined color slots, the attributes are meant to be reset
at the beginning of each item in the colored output. So setting
`color.decorate.branch` to `black` will paint that branch name in a
@@ -2036,6 +2039,10 @@ log.follow::
i.e. it cannot be used to follow multiple files and does not work well
on non-linear history.
+log.graphColors::
+ A list of colors, separated by commas, that can be used to draw
+ history lines in `git log --graph`.
+
log.showRoot::
If true, the initial commit will be shown as a big creation event.
This is equivalent to a diff against an empty tree.