diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-29 17:09:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-29 17:09:31 (GMT) |
| commit | e82935d9177f93a4777e8a3ee5e9d131fb884613 (patch) | |
| tree | 6f9958794b899fd9b6ef468f74c7ea632a847d2d /Documentation | |
| parent | 7654ca696348feaab3c7000b9bd13985e03f43ae (diff) | |
| parent | f4694a8c088106bb5a137407ffa9c8a0fe871566 (diff) | |
| download | git-e82935d9177f93a4777e8a3ee5e9d131fb884613.zip git-e82935d9177f93a4777e8a3ee5e9d131fb884613.tar.gz git-e82935d9177f93a4777e8a3ee5e9d131fb884613.tar.bz2 | |
Merge branch 'rb/pack-window-memory-config-doc'
* rb/pack-window-memory-config-doc:
config.txt: pack.windowmemory limit applies per-thread
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 8b49813..8212897 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1856,10 +1856,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 |