Merge branch 'ae/pack-autothread'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index fb6dae0cc2d399821c708c77904565e00ff2eb39..0c0bd3b0ebdf8e7161da7886a2eeedc73ee12d26 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -812,6 +812,8 @@ pack.threads::
        warning. This is meant to reduce packing time on multiprocessor
        machines. The required amount of memory for the delta search window
        is however multiplied by the number of threads.
+       Specifying 0 will cause git to auto-detect the number of CPU's
+       and set the number of threads accordingly.
 
 pack.indexVersion::
        Specify the default pack index version.  Valid values are 1 for