summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-27 19:54:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-27 19:54:03 (GMT)
commit3c972e1ec422e0e72ab192ee871656cd065ca80e (patch)
tree17a6288bda8f5f1ddb4ca9e0fc95240c7850c1bf /Documentation/config.txt
parent42dd2cd3a3f5228db77826d4d6a8490a9a710e45 (diff)
parent392b78ca42b6b1a68a77966acab38554c6edab3e (diff)
downloadgit-3c972e1ec422e0e72ab192ee871656cd065ca80e.zip
git-3c972e1ec422e0e72ab192ee871656cd065ca80e.tar.gz
git-3c972e1ec422e0e72ab192ee871656cd065ca80e.tar.bz2
Merge branch 'ae/pack-autothread'
* ae/pack-autothread: Revert "pack-objects: Print a message describing the number of threads for packing" pack-objects: Print a message describing the number of threads for packing pack-objects: Add runtime detection of online CPU's
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index fb6dae0..0c0bd3b 100644
--- 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