Merge branch 'sb/pull-rebase-submodule'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0e25b2c92b309330f27ce562e0f21f4e10179879..f57e9cf10ca485ae0147ee1d01639c94ce97fb56 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -3343,6 +3343,10 @@ uploadpack.packObjectsHook::
        was run. I.e., `upload-pack` will feed input intended for
        `pack-objects` to the hook, and expects a completed packfile on
        stdout.
+
+uploadpack.allowFilter::
+       If this option is set, `upload-pack` will advertise partial
+       clone and partial fetch object filtering.
 +
 Note that this configuration variable is ignored if it is seen in the
 repository-level config (this is a safety measure against fetching from