Merge branch 'sg/httpd-test-unflake'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a32172a43c7369d0fff2a0a0ad32f6fde07149bf..43b2de7b5fe21bffb623ccf8aba286c346440d51 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -3489,6 +3489,13 @@ Note that this configuration variable is ignored if it is seen in the
 repository-level config (this is a safety measure against fetching from
 untrusted repositories).
 
+uploadpack.allowRefInWant::
+       If this option is set, `upload-pack` will support the `ref-in-want`
+       feature of the protocol version 2 `fetch` command.  This feature
+       is intended for the benefit of load-balanced servers which may
+       not have the same view of what OIDs their refs point to due to
+       replication delay.
+
 url.<base>.insteadOf::
        Any URL that starts with this value will be rewritten to
        start, instead, with <base>. In cases where some site serves a