diff options
author | Brian Downing <bdowning@lavos.net> | 2007-07-12 07:55:52 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-07-12 14:32:35 -0700 |
commit | e93b15cd7441369f28dd4841ab504cea83c18b10 (patch) | |
tree | 3658bbb6bd63bd00ef5f30ade1c8792832a7e7f3 | |
parent | 121b42a5b4839c7d8756b0da3e6ed18e720b1295 (diff) | |
download | git-e93b15cd7441369f28dd4841ab504cea83c18b10.tar.gz git-e93b15cd7441369f28dd4841ab504cea83c18b10.tar.xz |
Add documentation for --window-memory, pack.windowMemory
Signed-off-by: Brian Downing <bdowning@lavos.net>
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | Documentation/config.txt | 6 | ||||
-rw-r--r-- | Documentation/git-pack-objects.txt | 11 | ||||
-rw-r--r-- | Documentation/git-repack.txt | 11 |
3 files changed, 28 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 4b67f0adf..11b332117 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -589,6 +589,12 @@ pack.depth:: The maximum delta depth used by gitlink:git-pack-objects[1] when no maximum depth is given on the command line. Defaults to 50. +pack.windowMemory:: + The window memory size limit used by gitlink: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. + pack.compression:: An integer -1..9, indicating the compression level for objects in a pack file. -1 is the zlib default. 0 means no diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index e3549b504..6f17cff24 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -85,6 +85,17 @@ base-name:: times to get to the necessary object. The default value for --window is 10 and --depth is 50. +--window-memory=[N]:: + This option provides an additional limit on top of `--window`; + the window size will dynamically scale down so as to not take + up more than N bytes in memory. This is useful in + repositories with a mix of large and small objects to not run + 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. + --max-pack-size=<n>:: Maximum size of each output packfile, expressed in MiB. If specified, multiple packfiles may be created. diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index 28949397c..5283ef84a 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -68,6 +68,17 @@ OPTIONS to be applied that many times to get to the necessary object. The default value for --window is 10 and --depth is 50. +--window-memory=[N]:: + This option provides an additional limit on top of `--window`; + the window size will dynamically scale down so as to not take + up more than N bytes in memory. This is useful in + repositories with a mix of large and small objects to not run + 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. + --max-pack-size=<n>:: Maximum size of each output packfile, expressed in MiB. If specified, multiple packfiles may be created. |