summaryrefslogtreecommitdiffstats
path: root/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-28 14:40:57 -0700
committerJunio C Hamano <gitster@pobox.com>2018-06-28 14:40:57 -0700
commitec40f134aa677499a0c1bf7ea6133b7b5fe348c4 (patch)
treeccfbc4d2f3b9dbf94015ba91975a7166105221f7 /config.txt
parent7578608bd24d16e08ff2c765d8e2aada854fee57 (diff)
downloadgit-htmldocs-ec40f134aa677499a0c1bf7ea6133b7b5fe348c4.tar.gz
Autogenerated HTML docs for v2.18.0-129-ge3331
Diffstat (limited to 'config.txt')
-rw-r--r--config.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/config.txt b/config.txt
index ab641bf5a..1cc18a828 100644
--- a/config.txt
+++ b/config.txt
@@ -1162,7 +1162,8 @@ color.diff.<slot>::
color.decorate.<slot>::
Use customized color for 'git log --decorate' output. `<slot>` is one
of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local
- branches, remote-tracking branches, tags, stash and HEAD, respectively.
+ branches, remote-tracking branches, tags, stash and HEAD, respectively
+ and `grafted` for grafted commits.
color.grep::
When set to `always`, always highlight matches. When `false` (or