From de1b24609b72920c618a689cfb620ede01640c8a Mon Sep 17 00:00:00 2001 From: Brian Downing Date: Mon, 19 Nov 2007 10:58:50 -0600 Subject: [PATCH 1/4] config: correct core.loosecompression documentation * core.loosecompression stated that the default was "0 (best speed)", when in fact 0 is "no compression", and the default is Z_BEST_SPEED, which is 1. Signed-off-by: Brian Downing Acked-by: Nicolas Pitre Signed-off-by: Junio C Hamano --- Documentation/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 7ee97df8a..95656526c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -232,7 +232,7 @@ core.loosecompression:: 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 From dec92309417d17cc35196efd018f15981f22b235 Mon Sep 17 00:00:00 2001 From: Brian Downing Date: Mon, 19 Nov 2007 10:58:51 -0600 Subject: [PATCH 2/4] config: clarify compression defaults * Clarify that core.compression provides a system-wide default to other compression parameters. * Explain that the default for pack.compression, -1, is "a default compromise between speed and compression (currently equivalent to level 6)" according to zlib.h. Signed-off-by: Brian Downing Acked-by: Nicolas Pitre Signed-off-by: Junio C Hamano --- Documentation/config.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 95656526c..83bc33c42 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -226,6 +226,8 @@ 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 @@ -622,7 +624,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 From 97e92e2cbca3dc850d8b04b30740be8d81c17552 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Mon, 19 Nov 2007 19:25:11 +0100 Subject: [PATCH 3/4] Doc fix for git-reflog: mention @{...} syntax, and in synopsys. The HEAD@{...} syntax was documented in git-rev-parse manpage, which is hard to find by someone looking for the documentation of porcelain. git-reflog is probably the place where one expects to find this. While I'm there, "git revlog show whatever" was also undocumented. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- Documentation/git-reflog.txt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt index 5c7316ceb..25003c386 100644 --- a/Documentation/git-reflog.txt +++ b/Documentation/git-reflog.txt @@ -19,7 +19,7 @@ depending on the subcommand: git reflog expire [--dry-run] [--stale-fix] [--verbose] [--expire=