diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2019-06-18 20:25:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-21 16:38:29 (GMT) |
| commit | 377444b440eab3b6ef636df092f7f8299acf75bb (patch) | |
| tree | a38c9411648d6cbb3aac25859c30d3a206290275 /Documentation/config/advice.txt | |
| parent | cdbd70c43773d534aa81ea2c83905a45ff0e74e4 (diff) | |
| download | git-377444b440eab3b6ef636df092f7f8299acf75bb.zip git-377444b440eab3b6ef636df092f7f8299acf75bb.tar.gz git-377444b440eab3b6ef636df092f7f8299acf75bb.tar.bz2 | |
fetch: warn about forced updates in branch listing
The --[no-]show-forced-updates option in 'git fetch' can be confusing
for some users, especially if it is enabled via config setting and not
by argument. Add advice to warn the user that the (forced update)
messages were not listed.
Additionally, warn users when the forced update check takes longer
than ten seconds, and recommend that they disable the check. These
messages can be disabled by the advice.fetchShowForcedUpdates config
setting.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/advice.txt')
| -rw-r--r-- | Documentation/config/advice.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index ec4f6ae..1f1e847 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -4,6 +4,10 @@ advice.*:: can tell Git that you do not need help by setting these to 'false': + -- + fetchShowForcedUpdates:: + Advice shown when linkgit:git-fetch[1] takes a long time + to calculate forced updates after ref updates, or to warn + that the check is disabled. pushUpdateRejected:: Set this variable to 'false' if you want to disable 'pushNonFFCurrent', |