Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-08 09:59:34 +0300
committerJunio C Hamano <gitster@pobox.com>2018-05-08 09:59:34 +0300
commita56fb3dcc09239795823de40ffcbbf5713114eb5 (patch)
treebbaacfff89ae614d0218b38705e43ea4d455e59b /config.c
parent3915f9a4fa2ae48b282a71f72113ca8629b27618 (diff)
parent79f62e7dd96ae0cf98b7eca1b763012d1a4db0bb (diff)
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 'config.c')
-rw-r--r--config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.c b/config.c
index ec96614133..6f8f1d8c11 100644
--- a/config.c
+++ b/config.c
@@ -1452,7 +1452,7 @@ int git_default_config(const char *var, const char *value, void *dummy)
if (starts_with(var, "mailmap."))
return git_default_mailmap_config(var, value);
- if (starts_with(var, "advice."))
+ if (starts_with(var, "advice.") || starts_with(var, "color.advice"))
return git_default_advice_config(var, value);
if (!strcmp(var, "pager.color") || !strcmp(var, "color.pager")) {