Signed-off-by: Michael Stahl <mst...@redhat.com>
---
Documentation/git-pack-objects.txt | 2 +-
Documentation/git-repack.txt | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-pack-objects.txt
b/Documentation/git-pack-objects.txt
index 19cdcd0..0b655a5 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -105,7 +105,7 @@ base-name::
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.
+ default, unless the config variable `pack.windowMemory` is set.
--max-pack-size=<n>::
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 c597523..300455b 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -101,7 +101,11 @@ other objects in that pack they already have locally.
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.
+ default, unless the config variable `pack.windowMemory` is set.
+ Note that the actual memory usage will be multiplied
+ by the number of threads used by linkgit:git-pack-objects[1],
+ which is lacking a corresponding git-repack flag but can be
+ set via the config variable `pack.threads`.
--max-pack-size=<n>::
Maximum size of each output pack file. The size can be suffixed with
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
