Merge branch 'nd/strbuf-inline-styles'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 989eb80ac1d3b0c1b756fb7a88874fa50a00eae3..0e1dde3fffc70ff8903e23392dfa7d534d435013 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2336,6 +2336,13 @@ transfer.unpackLimit::
        not set, the value of this variable is used instead.
        The default value is 100.
 
+uploadarchive.allowUnreachable::
+       If true, allow clients to use `git archive --remote` to request
+       any tree, whether reachable from the ref tips or not. See the
+       discussion in the `SECURITY` section of
+       linkgit:git-upload-archive[1] for more details. Defaults to
+       `false`.
+
 uploadpack.hiderefs::
        String(s) `upload-pack` uses to decide which refs to omit
        from its initial advertisement.  Use more than one