diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 13:15:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 13:15:42 -0700 |
| commit | 11ae320e2426a014c516958921458ae1382a84f4 (patch) | |
| tree | 5cfcb5266179992591032f26824a17d130117610 /config.txt | |
| parent | bfd91f4e89b5ab0f4238e1bfb7bd0e2a82adc225 (diff) | |
| download | git-htmldocs-11ae320e2426a014c516958921458ae1382a84f4.tar.gz | |
Autogenerated HTML docs for v2.19.0-rc0
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/config.txt b/config.txt index 95ad715a4..1c4236498 100644 --- a/config.txt +++ b/config.txt @@ -1225,8 +1225,10 @@ color.diff.<slot>:: (highlighting whitespace errors), `oldMoved` (deleted lines), `newMoved` (added lines), `oldMovedDimmed`, `oldMovedAlternative`, `oldMovedAlternativeDimmed`, `newMovedDimmed`, `newMovedAlternative` - and `newMovedAlternativeDimmed` (See the '<mode>' - setting of '--color-moved' in linkgit:git-diff[1] for details). + `newMovedAlternativeDimmed` (See the '<mode>' + setting of '--color-moved' in linkgit:git-diff[1] for details), + `contextDimmed`, `oldDimmed`, `newDimmed`, `contextBold`, + `oldBold`, and `newBold` (see linkgit:git-range-diff[1] for details). color.decorate.<slot>:: Use customized color for 'git log --decorate' output. `<slot>` is one @@ -1295,6 +1297,18 @@ color.push:: color.push.error:: Use customized color for push errors. +color.remote:: + If set, keywords at the start of the line are highlighted. The + keywords are "error", "warning", "hint" and "success", and are + matched case-insensitively. May be set to `always`, `false` (or + `never`) or `auto` (or `true`). If unset, then the value of + `color.ui` is used (`auto` by default). + +color.remote.<slot>:: + Use customized color for each remote keyword. `<slot>` may be + `hint`, `warning`, `success` or `error` which match the + corresponding keyword. + color.showBranch:: A boolean to enable/disable color in the output of linkgit:git-show-branch[1]. May be set to `always`, |