summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-14 11:50:40 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-14 11:50:40 -0700
commitcc13431a49800a6a1d2b7ff0b94f67da0fecdbab (patch)
treedb2f27147a21f3b3b053b0af81937bec033219d4 /Documentation
parent3f8acaae8a6a025339c413c663fc8f0d73f29665 (diff)
parentb038a61020573b1be6e5fc5b2be4485b63a9cbf1 (diff)
downloadgit-cc13431a49800a6a1d2b7ff0b94f67da0fecdbab.tar.gz
Merge branch 'nd/threaded-index-pack'
Enables threading in index-pack to resolve base data in parallel. By Nguyễn Thái Ngọc Duy (3) and Ramsay Jones (1) * nd/threaded-index-pack: index-pack: disable threading if NO_PREAD is defined index-pack: support multithreaded delta resolving index-pack: restructure pack processing into three main functions compat/win32/pthread.h: Add an pthread_key_delete() implementation
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-index-pack.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt
index 909687fed4..39e6d0ddd8 100644
--- a/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@ -74,6 +74,16 @@ OPTIONS
--strict::
Die, if the pack contains broken objects or links.
+--threads=<n>::
+ Specifies the number of threads to spawn when resolving
+ deltas. This requires that index-pack 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.
+ Specifying 0 will cause git to auto-detect the number of CPU's
+ and use maximum 3 threads.
+
Note
----