diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-20 23:00:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-20 23:00:07 -0800 |
| commit | 2ce1a1f23fd83d2cab22f87aff1165fb0c7ad450 (patch) | |
| tree | 58766d8d0e7cc77ae3ad7106d5ff469a4567c24a /Documentation/config.txt | |
| parent | 8e9739914972419baad820e76b44d9720ed885c2 (diff) | |
| parent | 8641ee3dcbae749c42b7cf117ba3050e2cb95a93 (diff) | |
| download | git-2ce1a1f23fd83d2cab22f87aff1165fb0c7ad450.tar.gz | |
Merge branch 'maint'
* maint:
send-email: add transfer encoding header with content-type
Doc fix for git-reflog: mention @{...} syntax, and <ref> in synopsys.
config: clarify compression defaults
config: correct core.loosecompression documentation
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 6dc9f3ed02..39d1ef5298 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -226,13 +226,15 @@ 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. + If set, this provides a default to other compression variables, + such as 'core.loosecompression' and 'pack.compression'. core.loosecompression:: An integer -1..9, indicating the compression level for objects that 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. If not set, defaults to core.compression. If that is - not set, defaults to 0 (best speed). + not set, defaults to 1 (best speed). core.packedGitWindowSize:: Number of bytes of a pack file to map into memory in a @@ -648,7 +650,9 @@ pack.compression:: 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. + not set, defaults to -1, the zlib default, which is "a default + compromise between speed and compression (currently equivalent + to level 6)." pack.deltaCacheSize:: The maximum memory in bytes used for caching deltas in |