Merge branch 'ds/fetch-disable-force-notice'

diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index 0103faa41703dca8418268fe78ebf8b5317cf318..ee85c536cec83c9097ae586da404580573448431 100644 (file)
--- 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',