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.c | |
| 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.c')
| -rw-r--r-- | advice.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -12,6 +12,7 @@ int advice_push_needs_force = 1; int advice_push_unqualified_ref_name = 1; int advice_status_hints = 1; int advice_status_u_option = 1; +int advice_status_ahead_behind_warning = 1; int advice_commit_before_merge = 1; int advice_reset_quiet_warning = 1; int advice_resolve_conflict = 1; @@ -68,6 +69,7 @@ static struct { { "pushUnqualifiedRefName", &advice_push_unqualified_ref_name }, { "statusHints", &advice_status_hints }, { "statusUoption", &advice_status_u_option }, + { "statusAheadBehindWarning", &advice_status_ahead_behind_warning }, { "commitBeforeMerge", &advice_commit_before_merge }, { "resetQuiet", &advice_reset_quiet_warning }, { "resolveConflict", &advice_resolve_conflict }, |