document git-repack interaction of pack.threads and pack.windowMemory
Signed-off-by: Michael Stahl <mstahl@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Stahl committed
Aug 10, 2016 at 12:39 UTC
954176c1288d70818fb03c6e04a8cbfb0db4e704
2 files changed
+6
-4
Documentation/git-pack-objects.txt
+2
-2
@@ -104,8 +104,8 @@ base-name::
104
out of memory with a large window, but still be able to take
105
advantage of the large window for the smaller objects. The
106
size can be suffixed with "k", "m", or "g".
107
- `--window-memory=0` makes memory usage unlimited, which is the
108
- default.
107
+ `--window-memory=0` makes memory usage unlimited. The default
108
+ is taken from the `pack.windowMemory` configuration variable.
109
110
--max-pack-size=<n>::
111
Maximum size of each output pack file. The size can be suffixed with
Documentation/git-repack.txt
+4
-2
@@ -100,8 +100,10 @@ other objects in that pack they already have locally.
100
out of memory with a large window, but still be able to take
101
advantage of the large window for the smaller objects. The
102
size can be suffixed with "k", "m", or "g".
103
- `--window-memory=0` makes memory usage unlimited, which is the
104
- default.
103
+ `--window-memory=0` makes memory usage unlimited. The default
104
+ is taken from the `pack.windowMemory` configuration variable.
105
+ Note that the actual memory usage will be the limit multiplied
106
+ by the number of threads used by linkgit:git-pack-objects[1].
107
108
--max-pack-size=<n>::
109
Maximum size of each output pack file. The size can be suffixed with