diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-09 22:25:46 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-09 22:25:46 (GMT) |
commit | 34186225b3ca3109586fd63ee83aeea342dc668e (patch) | |
tree | 826261c151c2a760c2aebaa7a681eff170c32352 /advice.h | |
parent | 2fff5094426c783ddedb79de588eb85647baa8f0 (diff) | |
parent | fb4db1a298b75536a861485bda27e3f1e098d6f6 (diff) | |
download | git-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.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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; |