summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-09-13 01:33:18 -0700
committerJunio C Hamano <gitster@pobox.com>2009-09-13 01:33:18 -0700
commitdc1b0c06ee9b3d2fb086a89e5b12da35bf360e4c (patch)
tree4097a3e7f1507c66ef4effc9d2da243c6382a3ed /config.c
parent8b54f63dce34c3bbd7ff919fb53c1c253221fe71 (diff)
parentedf563fbaa2ab50734db4a61e9092f25fbb5a417 (diff)
downloadgit-dc1b0c06ee9b3d2fb086a89e5b12da35bf360e4c.tar.gz
Merge branch 'jk/unwanted-advices'
* jk/unwanted-advices: status: make "how to stage" messages optional push: make non-fast-forward help message configurable
Diffstat (limited to 'config.c')
-rw-r--r--config.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/config.c b/config.c
index bf122202a0..c644061136 100644
--- a/config.c
+++ b/config.c
@@ -627,6 +627,9 @@ int git_default_config(const char *var, const char *value, void *dummy)
if (!prefixcmp(var, "mailmap."))
return git_default_mailmap_config(var, value);
+ if (!prefixcmp(var, "advice."))
+ return git_default_advice_config(var, value);
+
if (!strcmp(var, "pager.color") || !strcmp(var, "color.pager")) {
pager_use_color = git_config_bool(var,value);
return 0;