diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 12:41:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 12:41:34 -0700 |
| commit | d28017005fc64e9cfba3068bfe3c975cf7787767 (patch) | |
| tree | 811424124345fec28488a307ec9f20a613bb1980 /Documentation/config.txt | |
| parent | 39e415cfd1390ed31a61ca0ca175530302c9a58c (diff) | |
| parent | 59a255aef05633c45c780987fa0c861cda9006f2 (diff) | |
| download | git-d28017005fc64e9cfba3068bfe3c975cf7787767.tar.gz | |
Merge branch 'hn/highlight-sideband-keywords'
The sideband code learned to optionally paint selected keywords at
the beginning of incoming lines on the receiving end.
* hn/highlight-sideband-keywords:
sideband: do not read beyond the end of input
sideband: highlight keywords in remote sideband output
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 1c78df7b90..1c42364988 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1297,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`, |