Merge branch 'ak/lazy-prereq-mktemp' into maint

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d51182a0606aa30168d640d2d821a3ec1bc2458d..febf95d6c663d723a66a30d936bd49b1a02b467a 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2971,6 +2971,11 @@ uploadpack.allowReachableSHA1InWant::
        calculating object reachability is computationally expensive.
        Defaults to `false`.
 
+uploadpack.allowAnySHA1InWant::
+       Allow `upload-pack` to accept a fetch request that asks for any
+       object at all.
+       Defaults to `false`.
+
 uploadpack.keepAlive::
        When `upload-pack` has started `pack-objects`, there may be a
        quiet period while `pack-objects` prepares the pack. Normally