summaryrefslogtreecommitdiffstats
path: root/config.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-09-09 13:38:58 +0200
committerJunio C Hamano <gitster@pobox.com>2009-09-12 06:33:20 +0200
commit75194438f412714f4e82ca01e9038dc6714498c4 (patch)
treefdb94ce1638902652ab77a84d7ffa9271f2fe47a /config.c
parentMerge branch 'maint' (diff)
downloadgit-75194438f412714f4e82ca01e9038dc6714498c4.tar.xz
git-75194438f412714f4e82ca01e9038dc6714498c4.zip
push: make non-fast-forward help message configurable
This message is designed to help new users understand what has happened when refs fail to push. However, it does not help experienced users at all, and significantly clutters the output, frequently dwarfing the regular status table and making it harder to see. This patch introduces a general configuration mechanism for optional messages, with this push message as the first example. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 e87edeab0c..f21530cdbd 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;