Merge branch 'jc/git-open-cloexec'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 801de7933b7001ae12557569063b2c89412de19a..1abf078c4e1c79ee11b05c2a26d83ba28c809a66 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1409,7 +1409,9 @@ gc.pruneExpire::
        Override the grace period with this config variable.  The value
        "now" may be used to disable this grace period and always prune
        unreachable objects immediately, or "never" may be used to
-       suppress pruning.
+       suppress pruning.  This feature helps prevent corruption when
+       'git gc' runs concurrently with another process writing to the
+       repository; see the "NOTES" section of linkgit:git-gc[1].
 
 gc.worktreePruneExpire::
        When 'git gc' is run, it calls
@@ -3028,6 +3030,11 @@ uploadpack.allowReachableSHA1InWant::
        section of the linkgit:gitnamespaces[7] man page; it's best to
        keep private data in a separate repository.
 
+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