diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-05-20 02:19:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-20 02:19:19 -0700 |
| commit | 45bde46bfb9cbc5565f9fc6caa819333578c53e1 (patch) | |
| tree | 48f99ae41d842204af4ea63d3bd7bff788b068e3 /Documentation | |
| parent | Merge branch 'mst/connect' (diff) | |
| parent | Custom compression levels for objects and packs (diff) | |
| download | tgif-45bde46bfb9cbc5565f9fc6caa819333578c53e1.tar.xz | |
Merge branch 'dh/pack'
* dh/pack:
Custom compression levels for objects and packs
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 17 | ||||
| -rw-r--r-- | Documentation/git-pack-objects.txt | 14 |
2 files changed, 28 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index b8d48d1013..ee1c35e8eb 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -204,10 +204,16 @@ core.warnAmbiguousRefs:: and might match multiple refs in the .git/refs/ tree. True by default. core.compression:: + An integer -1..9, indicating a default compression level. + -1 is the zlib default. 0 means no compression, + and 1..9 are various speed/size tradeoffs, 9 being slowest. + +core.loosecompression:: An integer -1..9, indicating the compression level for objects that - are not in a pack file. -1 is the zlib and git default. 0 means no + are not in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being - slowest. + slowest. If not set, defaults to core.compression. If that is + not set, defaults to 0 (best speed). core.packedGitWindowSize:: Number of bytes of a pack file to map into memory in a @@ -542,6 +548,13 @@ 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.compression:: + An integer -1..9, indicating the compression level for objects + in a pack file. -1 is the zlib default. 0 means no + compression, and 1..9 are various speed/size tradeoffs, 9 being + slowest. If not set, defaults to core.compression. If that is + not set, defaults to -1. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once. diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index ce892147dd..2531238df4 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -130,10 +130,22 @@ base-name:: --no-reuse-object:: This flag tells the command not to reuse existing object data at all, including non deltified object, forcing recompression of everything. - This implies --no-reuse-delta. Useful only in the obscur case where + This implies --no-reuse-delta. Useful only in the obscure case where wholesale enforcement of a different compression level on the packed data is desired. +--compression=[N]:: + Specifies compression level for newly-compressed data in the + generated pack. If not specified, pack compression level is + determined first by pack.compression, then by core.compression, + and defaults to -1, the zlib default, if neither is set. + Data copied from loose objects will be recompressed + if core.legacyheaders was true when they were created or if + the loose compression level (see core.loosecompression and + core.compression) is now a different value than the pack + compression level. Add --no-reuse-object if you want to force + a uniform compression level on all data no matter the source. + --delta-base-offset:: A packed archive can express base object of a delta as either 20-byte object name or as an offset in the |