summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-09-15 05:33:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-15 05:33:28 (GMT)
commitd225ae59c9102f2769c55749f80f7a94a92713e4 (patch)
tree35ed2e2aa5a7346f96fb46ef76a88df309acaf59 /Documentation
parent357c5e086c28581918329281be18ab236d33967f (diff)
parente1ef867328bd7d2cd67499ac30479821bdf96662 (diff)
downloadgit-d225ae59c9102f2769c55749f80f7a94a92713e4.zip
git-d225ae59c9102f2769c55749f80f7a94a92713e4.tar.gz
git-d225ae59c9102f2769c55749f80f7a94a92713e4.tar.bz2
Merge branch 'np/delta'
* np/delta: builtin-pack-objects.c: avoid bogus gcc warnings threaded delta search: proper locking for cache accounting threaded delta search: add pack.threads config variable fix threaded delta search locking threaded delta search: specify number of threads at run time threaded delta search: better chunck split point threaded delta search: refine work allocation basic threaded delta search rearrange delta search progress reporting localize window memory usage accounting straighten the list of objects to deltify
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt10
-rw-r--r--Documentation/git-pack-objects.txt8
2 files changed, 17 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.
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index f8a0be3..628f296 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -169,6 +169,14 @@ base-name::
length, this option typically shrinks the resulting
packfile by 3-5 per-cent.
+--threads=<n>::
+ Specifies the number of threads to spawn when searching for best
+ delta matches. This requires that pack-objects 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.
+
--index-version=<version>[,<offset>]::
This is intended to be used by the test suite only. It allows
to force the version for the generated pack index, and to force