Merge branch 'rb/pack-window-memory-config-doc'

* rb/pack-window-memory-config-doc:
  config.txt: pack.windowmemory limit applies per-thread
This commit is contained in:
Junio C Hamano 2014-10-29 10:09:31 -07:00
commit e82935d917

View File

@ -1856,10 +1856,11 @@ pack.depth::
maximum depth is given on the command line. Defaults to 50. maximum depth is given on the command line. Defaults to 50.
pack.windowMemory:: pack.windowMemory::
The window memory size limit used by linkgit:git-pack-objects[1] The maximum size of memory that is consumed by each thread
when no limit is given on the command line. The value can be in linkgit:git-pack-objects[1] for pack window memory when
suffixed with "k", "m", or "g". Defaults to 0, meaning no no limit is given on the command line. The value can be
limit. suffixed with "k", "m", or "g". When left unconfigured (or
set explicitly to 0), there will be no limit.
pack.compression:: pack.compression::
An integer -1..9, indicating the compression level for objects An integer -1..9, indicating the compression level for objects