summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-09-10 15:51:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-10 17:50:21 (GMT)
commit693b86fffb4271dece49f439b133595924a75cbb (patch)
tree7ad528796225b92a641f3525d18c4a1767d0c438 /Documentation
parentb81d9af71e1c6460511322c276b4b7ad7c86c444 (diff)
downloadgit-693b86fffb4271dece49f439b133595924a75cbb.zip
git-693b86fffb4271dece49f439b133595924a75cbb.tar.gz
git-693b86fffb4271dece49f439b133595924a75cbb.tar.bz2
threaded delta search: add pack.threads config variable
Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 866e053..015910f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -630,9 +630,17 @@ pack.deltaCacheSize::
A value of 0 means no limit. Defaults to 0.
pack.deltaCacheLimit::
- The maxium size of a delta, that is cached in
+ The maximum size of a delta, that is cached in
gitlink:git-pack-objects[1]. Defaults to 1000.
+pack.threads::
+ Specifies the number of threads to spawn when searching for best
+ delta matches. This requires that gitlink:git-pack-objects[1]
+ be compiled with pthreads otherwise this option is ignored with a
+ 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.
+
pull.octopus::
The default merge strategy to use when pulling multiple branches
at once.