Merge branch 'du/rev-parse-is-plumbing' into maint

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ee3b5dd8ef1d9620a555a526a7d15b917b0353af..09a2385280111679cba2c32b471ef91a487b14cf 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -3634,15 +3634,15 @@ 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 support 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
 untrusted repositories).
 
+uploadpack.allowFilter::
+       If this option is set, `upload-pack` will support partial
+       clone and partial fetch object filtering.
+
 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