Merge branch 'ms/document-pack-window-memory-is-per-thread'

* ms/document-pack-window-memory-is-per-thread:
  document git-repack interaction of pack.threads and pack.windowMemory
This commit is contained in:
Junio C Hamano 2016-08-12 09:47:35 -07:00
commit 62134efdba
2 changed files with 6 additions and 4 deletions

View file

@ -104,8 +104,8 @@ base-name::
out of memory with a large window, but still be able to take out of memory with a large window, but still be able to take
advantage of the large window for the smaller objects. The advantage of the large window for the smaller objects. The
size can be suffixed with "k", "m", or "g". size can be suffixed with "k", "m", or "g".
`--window-memory=0` makes memory usage unlimited, which is the `--window-memory=0` makes memory usage unlimited. The default
default. is taken from the `pack.windowMemory` configuration variable.
--max-pack-size=<n>:: --max-pack-size=<n>::
Maximum size of each output pack file. The size can be suffixed with Maximum size of each output pack file. The size can be suffixed with

View file

@ -100,8 +100,10 @@ other objects in that pack they already have locally.
out of memory with a large window, but still be able to take out of memory with a large window, but still be able to take
advantage of the large window for the smaller objects. The advantage of the large window for the smaller objects. The
size can be suffixed with "k", "m", or "g". size can be suffixed with "k", "m", or "g".
`--window-memory=0` makes memory usage unlimited, which is the `--window-memory=0` makes memory usage unlimited. The default
default. is taken from the `pack.windowMemory` configuration variable.
Note that the actual memory usage will be the limit multiplied
by the number of threads used by linkgit:git-pack-objects[1].
--max-pack-size=<n>:: --max-pack-size=<n>::
Maximum size of each output pack file. The size can be suffixed with Maximum size of each output pack file. The size can be suffixed with