Merge branch 'es/test-cmp-typocatcher'

[thirdparty/git.git] / Documentation / config / uploadpack.txt

diff --git a/Documentation/config/uploadpack.txt b/Documentation/config/uploadpack.txt
index ed1c835695c3cf2a9058163b19bef7070695113f..ee7b3ac94f82e4376d06d63c9a09d9370b10a34c 100644 (file)
--- a/Documentation/config/uploadpack.txt
+++ b/Documentation/config/uploadpack.txt
@@ -57,6 +57,24 @@ uploadpack.allowFilter::
        If this option is set, `upload-pack` will support partial
        clone and partial fetch object filtering.
 
+uploadpackfilter.allow::
+       Provides a default value for unspecified object filters (see: the
+       below configuration variable).
+       Defaults to `true`.
+
+uploadpackfilter.<filter>.allow::
+       Explicitly allow or ban the object filter corresponding to
+       `<filter>`, where `<filter>` may be one of: `blob:none`,
+       `blob:limit`, `tree`, `sparse:oid`, or `combine`. If using
+       combined filters, both `combine` and all of the nested filter
+       kinds must be allowed. Defaults to `uploadpackfilter.allow`.
+
+uploadpackfilter.tree.maxDepth::
+       Only allow `--filter=tree=<n>` when `n` is no more than the value of
+       `uploadpackfilter.tree.maxDepth`. If set, this also implies
+       `uploadpackfilter.tree.allow=true`, unless this configuration
+       variable had already been set. Has no effect if unset.
+
 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