diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-08 06:59:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 06:59:34 (GMT) |
| commit | a56fb3dcc09239795823de40ffcbbf5713114eb5 (patch) | |
| tree | bbaacfff89ae614d0218b38705e43ea4d455e59b /Documentation | |
| parent | 3915f9a4fa2ae48b282a71f72113ca8629b27618 (diff) | |
| parent | 79f62e7dd96ae0cf98b7eca1b763012d1a4db0bb (diff) | |
| download | git-a56fb3dcc09239795823de40ffcbbf5713114eb5.zip git-a56fb3dcc09239795823de40ffcbbf5713114eb5.tar.gz git-a56fb3dcc09239795823de40ffcbbf5713114eb5.tar.bz2 | |
Merge branch 'js/colored-push-errors'
Error messages from "git push" can be painted for more visibility.
* js/colored-push-errors:
config: document the settings to colorize push errors/hints
push: test to verify that push errors are colored
push: colorize errors
color: introduce support for colorizing stderr
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 8213c12..a05a88f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1098,6 +1098,16 @@ clean.requireForce:: A boolean to make git-clean do nothing unless given -f, -i or -n. Defaults to true. +color.advice:: + A boolean to enable/disable color in hints (e.g. when a push + failed, see `advice.*` for a list). May be set to `always`, + `false` (or `never`) or `auto` (or `true`), in which case colors + are used only when the error output goes to a terminal. If + unset, then the value of `color.ui` is used (`auto` by default). + +color.advice.hint:: + Use customized color for hints. + color.branch:: A boolean to enable/disable color in the output of linkgit:git-branch[1]. May be set to `always`, @@ -1200,6 +1210,15 @@ color.pager:: A boolean to enable/disable colored output when the pager is in use (default is true). +color.push:: + A boolean to enable/disable color in push errors. May be set to + `always`, `false` (or `never`) or `auto` (or `true`), in which + case colors are used only when the error output goes to a terminal. + If unset, then the value of `color.ui` is used (`auto` by default). + +color.push.error:: + Use customized color for push errors. + color.showBranch:: A boolean to enable/disable color in the output of linkgit:git-show-branch[1]. May be set to `always`, @@ -1228,6 +1247,15 @@ color.status.<slot>:: status short-format), or `unmerged` (files which have unmerged changes). +color.transport:: + A boolean to enable/disable color when pushes are rejected. May be + set to `always`, `false` (or `never`) or `auto` (or `true`), in which + case colors are used only when the error output goes to a terminal. + If unset, then the value of `color.ui` is used (`auto` by default). + +color.transport.rejected:: + Use customized color when a push was rejected. + color.ui:: This variable determines the default value for variables such as `color.diff` and `color.grep` that control the use of color |