summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Robert de Bath <rdebath@tvisiontech.co.uk>2014-10-24 08:43:27 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-28 09:59:41 -0700
commitf4694a8c088106bb5a137407ffa9c8a0fe871566 (patch)
treec88c5bdff35cc8f00a302b089a2632e73015eb2f
parentMerge branch 'maint-2.0' into maint (diff)
downloadtgif-f4694a8c088106bb5a137407ffa9c8a0fe871566.tar.xz
config.txt: pack.windowmemory limit applies per-thread
It took me a long time to notice the rider on the pack.threads configuration option that it would multiple the memory consumption by the number of CPUs in the machine. Clarify that the limit applies per-thread. Signed-off-by: Robert de Bath <rdebath@tvisiontech.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/config.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c55c22ab7b..99b5c6928b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1827,10 +1827,11 @@ pack.depth::
maximum depth is given on the command line. Defaults to 50.
pack.windowMemory::
- The window memory size limit used by linkgit:git-pack-objects[1]
- when no limit is given on the command line. The value can be
- suffixed with "k", "m", or "g". Defaults to 0, meaning no
- limit.
+ The maximum size of memory that is consumed by each thread
+ in linkgit:git-pack-objects[1] for pack window memory when
+ no limit is given on the command line. The value can be
+ suffixed with "k", "m", or "g". When left unconfigured (or
+ set explicitly to 0), there will be no limit.
pack.compression::
An integer -1..9, indicating the compression level for objects