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 /Documentation/config | |
| 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 'Documentation/config')
| -rw-r--r-- | Documentation/config/advice.txt | 6 | ||||
| -rw-r--r-- | Documentation/config/status.txt | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index d5fd05c..0103faa 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -37,6 +37,12 @@ advice.*:: we can still suggest that the user push to either refs/heads/* or refs/tags/* based on the type of the source object. + statusAheadBehind:: + Shown when linkgit:git-status[1] computes the ahead/behind + counts for a local ref compared to its remote tracking ref, + and that calculation takes longer than expected. Will not + appear if `status.aheadBehind` is false or the option + `--no-ahead-behind` is given. statusHints:: Show directions on how to proceed from the current state in the output of linkgit:git-status[1], in diff --git a/Documentation/config/status.txt b/Documentation/config/status.txt index ed72fa7..0fc704a 100644 --- a/Documentation/config/status.txt +++ b/Documentation/config/status.txt @@ -12,6 +12,11 @@ status.branch:: Set to true to enable --branch by default in linkgit:git-status[1]. The option --no-branch takes precedence over this variable. +status.aheadBehind:: + Set to true to enable `--ahead-behind` and false to enable + `--no-ahead-behind` by default in linkgit:git-status[1] for + non-porcelain status formats. Defaults to true. + status.displayCommentPrefix:: If set to true, linkgit:git-status[1] will insert a comment prefix before each output line (starting with |