Re: [PATCH v2 4/4] Document the new color.* settings to colorize push errors/hints

2018-04-07 Thread Eric Sunshine
On Fri, Apr 6, 2018 at 8:15 AM, Johannes Schindelin
 wrote:
> On Fri, 6 Apr 2018, Eric Sunshine wrote:
>> On Thu, Apr 5, 2018 at 6:48 PM, Johannes Schindelin
>>  wrote:
>> > +color.advice.advice::
>> > +   Use customized color for hints.
>>
>> Is "color.advice.advice" correct?
>
> As per the patch, yes. But you're right, it sounds silly. Will change to
> `color.advice.hint`, okay?

That's more understandable. Thanks.


Re: [PATCH v2 4/4] Document the new color.* settings to colorize push errors/hints

2018-04-06 Thread Johannes Schindelin
Hi Eric,

On Fri, 6 Apr 2018, Eric Sunshine wrote:

> On Thu, Apr 5, 2018 at 6:48 PM, Johannes Schindelin
>  wrote:
> > Let's make it easier for users to find out how to customize these colors.
> >
> > Signed-off-by: Johannes Schindelin 
> > ---
> > diff --git a/Documentation/config.txt b/Documentation/config.txt
> > @@ -1088,6 +1088,16 @@ clean.requireForce::
> > +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.advice::
> > +   Use customized color for hints.
> 
> Is "color.advice.advice" correct?

As per the patch, yes. But you're right, it sounds silly. Will change to
`color.advice.hint`, okay?

Will be fixed in v3,
Dscho


Re: [PATCH v2 4/4] Document the new color.* settings to colorize push errors/hints

2018-04-06 Thread Eric Sunshine
On Thu, Apr 5, 2018 at 6:48 PM, Johannes Schindelin
 wrote:
> Let's make it easier for users to find out how to customize these colors.
>
> Signed-off-by: Johannes Schindelin 
> ---
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> @@ -1088,6 +1088,16 @@ clean.requireForce::
> +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.advice::
> +   Use customized color for hints.

Is "color.advice.advice" correct?


[PATCH v2 4/4] Document the new color.* settings to colorize push errors/hints

2018-04-05 Thread Johannes Schindelin
Let's make it easier for users to find out how to customize these colors.

Signed-off-by: Johannes Schindelin 
---
 Documentation/config.txt | 28 
 1 file changed, 28 insertions(+)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4e0cff87f62..40e3828b85f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1088,6 +1088,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.advice::
+   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`,
@@ -1190,6 +1200,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`,
@@ -1218,6 +1237,15 @@ color.status.::
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
-- 
2.17.0.windows.1.4.g7e4058d72e3