From: Junio C Hamano Date: Wed, 21 Nov 2007 08:54:42 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3.6-861-gd794 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2e72a94923ba6000bc622b898f6dc711ebb9f8a2;p=git.git Autogenerated HTML docs for v1.5.3.6-861-gd794 --- diff --git a/config.txt b/config.txt index 6dc9f3ed0..39d1ef529 100644 --- a/config.txt +++ b/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 diff --git a/git-config.html b/git-config.html index 722c06a47..853dcb926 100644 --- a/git-config.html +++ b/git-config.html @@ -950,6 +950,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.

@@ -961,7 +963,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).

@@ -1690,7 +1692,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)."

@@ -1967,7 +1971,7 @@ transfer.unpackLimit diff --git a/git-reflog.html b/git-reflog.html index 37887a126..6b5fc99c4 100644 --- a/git-reflog.html +++ b/git-reflog.html @@ -281,7 +281,7 @@ depending on the subcommand:

git reflog expire [--dry-run] [--stale-fix] [--verbose] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>…
-

git reflog [show] [log-options]

+

git reflog [show] [log-options] [<ref>]

Reflog is a mechanism to record when the tip of branches are updated. This command is to manage the information recorded in it.

The subcommand "expire" is used to prune older reflog entries. @@ -291,9 +291,15 @@ tip, are removed from the reflog. This is typically not used directly by the end users — instead, see git-gc(1).

The subcommand "show" (which is also the default, in the absence of any subcommands) will take all the normal log options, and show the log of -HEAD, which will cover all recent actions, including branch switches. -It is basically an alias for git log -g --abbrev-commit ---pretty=oneline, see git-log(1).

+the reference provided in the command-line (or HEAD, by default). +The reflog will cover all recent actions (HEAD reflog records branch switching +as well). It is an alias for git log -g --abbrev-commit --pretty=oneline; +see git-log(1).

+

The reflog is useful in various git commands, to specify the old value +of a reference. For example, HEAD@{2} means "where HEAD used to be +two moves ago", master@{one.week.ago} means "where master used to +point to one week ago", and so on. See git-rev-parse(1) for +more details.

OPTIONS

@@ -369,7 +375,7 @@ them.

diff --git a/git-reflog.txt b/git-reflog.txt index 5c7316ceb..25003c386 100644 --- a/git-reflog.txt +++ b/git-reflog.txt @@ -19,7 +19,7 @@ depending on the subcommand: git reflog expire [--dry-run] [--stale-fix] [--verbose] [--expire=