Merge branch 'ab/fetch-prune'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index e254bfd5311a80e23a8f96bd652d007682c438b2..bbd66f5b9806b1315f8d79525f7b1fda48b434ee 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -3361,6 +3361,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