From: Junio C Hamano Date: Fri, 12 Aug 2016 16:47:35 +0000 (-0700) Subject: Merge branch 'ms/document-pack-window-memory-is-per-thread' X-Git-Tag: v2.10.0-rc0~15 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/62134efdba558180df997299df565e08e662f4c7?hp=-c Merge branch 'ms/document-pack-window-memory-is-per-thread' * ms/document-pack-window-memory-is-per-thread: document git-repack interaction of pack.threads and pack.windowMemory --- 62134efdba558180df997299df565e08e662f4c7 diff --combined Documentation/git-repack.txt index c5975234f4,9597777ada..26afe6ed54 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@@ -100,8 -100,10 +100,10 @@@ other objects in that pack they alread 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 @@@ -128,19 -130,6 +130,19 @@@ with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects. +--unpack-unreachable=:: + When loosening unreachable objects, do not bother loosening any + objects older than ``. This can be used to optimize out + the write of any objects that would be immediately pruned by + a follow-up `git prune`. + +-k:: +--keep-unreachable:: + When used with `-ad`, any unreachable objects from existing + packs will be appended to the end of the packfile instead of + being removed. In addition, any unreachable loose objects will + be packed (and their loose counterparts removed). + Configuration -------------