From 954176c1288d70818fb03c6e04a8cbfb0db4e704 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 10 Aug 2016 12:39:35 +0200 Subject: document git-repack interaction of pack.threads and pack.windowMemory Signed-off-by: Michael Stahl Signed-off-by: Junio C Hamano diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 19cdcd0..8973510 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -104,8 +104,8 @@ base-name:: out of memory with a large window, but still be able to take advantage of the large window for the smaller objects. The size can be suffixed with "k", "m", or "g". - `--window-memory=0` makes memory usage unlimited, which is the - default. + `--window-memory=0` makes memory usage unlimited. The default + is taken from the `pack.windowMemory` configuration variable. --max-pack-size=:: Maximum size of each output pack file. The size can be suffixed with diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index 0c03eec..9597777 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -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 advantage of the large window for the smaller objects. The size can be suffixed with "k", "m", or "g". - `--window-memory=0` makes memory usage unlimited, which is the - default. + `--window-memory=0` makes memory usage unlimited. The 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=:: Maximum size of each output pack file. The size can be suffixed with -- cgit v0.10.2-6-g49f6