summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-09 22:25:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-09 22:25:46 (GMT)
commit34186225b3ca3109586fd63ee83aeea342dc668e (patch)
tree826261c151c2a760c2aebaa7a681eff170c32352 /advice.h
parent2fff5094426c783ddedb79de588eb85647baa8f0 (diff)
parentfb4db1a298b75536a861485bda27e3f1e098d6f6 (diff)
downloadgit-34186225b3ca3109586fd63ee83aeea342dc668e.zip
git-34186225b3ca3109586fd63ee83aeea342dc668e.tar.gz
git-34186225b3ca3109586fd63ee83aeea342dc668e.tar.bz2
Merge branch 'jh/status-aheadbehind'
"git status" can be told a non-standard default value for the "--[no-]ahead-behind" option with a new configuration variable status.aheadBehind. * jh/status-aheadbehind: status: ignore status.aheadbehind in porcelain formats status: warn when a/b calculation takes too long status: add status.aheadbehind setting
Diffstat (limited to 'advice.h')
-rw-r--r--advice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index e50f02c..c86de9b 100644
--- a/advice.h
+++ b/advice.h
@@ -12,6 +12,7 @@ extern int advice_push_needs_force;
extern int advice_push_unqualified_ref_name;
extern int advice_status_hints;
extern int advice_status_u_option;
+extern int advice_status_ahead_behind_warning;
extern int advice_commit_before_merge;
extern int advice_reset_quiet_warning;
extern int advice_resolve_conflict;