Merge branch 'jt/avoid-ls-refs-with-http'

diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt
index ba890b5884fc3496e6529cb8e1f41ad7dd9748f4..d402110638b4e465075bf1a59885563d15f190e1 100644 (file)
--- a/Documentation/config/fetch.txt
+++ b/Documentation/config/fetch.txt
@@ -59,7 +59,8 @@ fetch.negotiationAlgorithm::
        effort to converge faster, but may result in a larger-than-necessary
        packfile; The default is "default" which instructs Git to use the default algorithm
        that never skips commits (unless the server has acknowledged it or one
-       of its descendants).
+       of its descendants). If `feature.experimental` is enabled, then this
+       setting defaults to "skipping".
        Unknown values will cause 'git fetch' to error out.
 +
 See also the `--negotiation-tip` option for linkgit:git-fetch[1].