From f2ce297388d7f2110479ff3aadcec4af41b1bc77 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 20 May 2007 19:12:09 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.2-14-g45bde --- config.txt | 35 +++++++++++++++++-------------- git-config.html | 48 ++++++++++++++++++++++++++++--------------- git-gc.html | 23 +++++++++++++++++++-- git-gc.txt | 16 ++++++++++++++- git-pack-objects.html | 31 +++++++++++++++++++++++++++- git-pack-objects.txt | 19 +++++++++++++++++ git-update-ref.html | 6 ++++-- git-update-ref.txt | 5 ++++- 8 files changed, 145 insertions(+), 38 deletions(-) diff --git a/config.txt b/config.txt index ea434af9d..ee1c35e8e 100644 --- a/config.txt +++ b/config.txt @@ -204,23 +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. - -core.legacyheaders:: - A boolean which - changes the format of loose objects so that they are more - efficient to pack and to send out of the repository over git - native protocol, since v1.4.2. However, loose objects - written in the new format cannot be read by git older than - that version; people fetching from your repository using - older versions of git over dumb transports (e.g. http) - will also be affected. -+ -To let git use the new loose object format, you have to -set core.legacyheaders to false. + 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 @@ -384,6 +377,11 @@ format.suffix:: `.patch`. Use this variable to change that suffix (make sure to include the dot if you want it). +gc.aggressiveWindow:: + The window size parameter used in the delta compression + algorithm used by 'git gc --aggressive'. This defaults + to 10. + gc.packrefs:: `git gc` does not run `git pack-refs` in a bare repository by default so that older dumb-transport clients can still fetch @@ -550,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/git-config.html b/git-config.html index 9251753c0..58f0ed34f 100644 --- a/git-config.html +++ b/git-config.html @@ -834,28 +834,22 @@ core.compression

- 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 - compression, and 1..9 are various speed/size tradeoffs, 9 being - slowest. + 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.legacyheaders +core.loosecompression

- A boolean which - changes the format of loose objects so that they are more - efficient to pack and to send out of the repository over git - native protocol, since v1.4.2. However, loose objects - written in the new format cannot be read by git older than - that version; people fetching from your repository using - older versions of git over dumb transports (e.g. http) - will also be affected. + 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).

-

To let git use the new loose object format, you have to -set core.legacyheaders to false.

core.packedGitWindowSize @@ -1115,6 +1109,16 @@ format.suffix

+gc.aggressiveWindow +
+
+

+ The window size parameter used in the delta compression + algorithm used by git gc --aggressive. This defaults + to 10. +

+
+
gc.packrefs
@@ -1432,6 +1436,18 @@ pack.depth

+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
@@ -1663,7 +1679,7 @@ transfer.unpackLimit diff --git a/git-gc.html b/git-gc.html index 687a283db..541cdaab6 100644 --- a/git-gc.html +++ b/git-gc.html @@ -272,7 +272,7 @@ git-gc(1) Manual Page

SYNOPSIS

-

git-gc [--prune]

+

git-gc [--prune] [--aggressive]

DESCRIPTION

@@ -303,6 +303,19 @@ operating performance.

in a cron script).

+
+--aggressive +
+
+

+ Usually git-gc runs very quickly while providing good disk + space utilization and performance. This option will cause + git-gc to more aggressive optimize the repository at the expense + of taking much more time. The effects of this optimization are + persistent, so this option only needs to be sporadically; every + few hundred changesets or so. +

+

Configuration

@@ -330,6 +343,12 @@ kept. This defaults to 15 days.

git gc runs git-pack-refs. Without the configuration, git-pack-refs is not run in bare repositories by default, to allow older dumb-transport clients fetch from the repository, but this will change in the future.

+

The optional configuration variable gc.aggressiveWindow controls how +much time is spent optimizing the delta compression of the objects in +the repository when the --aggressive option is specified. The larger +the value, the more time is spent optimizing the delta compression. See +the documentation for the --window' option in git-repack(1) for +more details. This defaults to 10.

See Also

@@ -348,7 +367,7 @@ clients fetch from the repository, but this will change in the future.

diff --git a/git-gc.txt b/git-gc.txt index bc1658434..4ac839f93 100644 --- a/git-gc.txt +++ b/git-gc.txt @@ -8,7 +8,7 @@ git-gc - Cleanup unnecessary files and optimize the local repository SYNOPSIS -------- -'git-gc' [--prune] +'git-gc' [--prune] [--aggressive] DESCRIPTION ----------- @@ -35,6 +35,13 @@ OPTIONS repository at the same time (e.g. never use this option in a cron script). +--aggressive:: + Usually 'git-gc' runs very quickly while providing good disk + space utilization and performance. This option will cause + git-gc to more aggressive optimize the repository at the expense + of taking much more time. The effects of this optimization are + persistent, so this option only needs to be sporadically; every + few hundred changesets or so. Configuration ------------- @@ -67,6 +74,13 @@ The optional configuration variable 'gc.packrefs' determines if is not run in bare repositories by default, to allow older dumb-transport clients fetch from the repository, but this will change in the future. +The optional configuration variable 'gc.aggressiveWindow' controls how +much time is spent optimizing the delta compression of the objects in +the repository when the --aggressive option is specified. The larger +the value, the more time is spent optimizing the delta compression. See +the documentation for the --window' option in gitlink:git-repack[1] for +more details. This defaults to 10. + See Also -------- gitlink:git-prune[1] diff --git a/git-pack-objects.html b/git-pack-objects.html index 43b081f9e..6af52ff9a 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -452,6 +452,35 @@ 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 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
@@ -499,7 +528,7 @@ base-name diff --git a/git-pack-objects.txt b/git-pack-objects.txt index bd3ee456e..2531238df 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt @@ -127,6 +127,25 @@ base-name:: This flag tells the command not to reuse existing deltas but compute them from scratch. +--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 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 diff --git a/git-update-ref.html b/git-update-ref.html index 068eb7dfd..046d819fc 100644 --- a/git-update-ref.html +++ b/git-update-ref.html @@ -272,7 +272,7 @@ git-update-ref(1) Manual Page

SYNOPSIS

-

git-update-ref [-m <reason>] (-d <ref> <oldvalue> | <ref> <newvalue> [<oldvalue>])

+

git-update-ref [-m <reason>] (-d <ref> <oldvalue> | [--no-deref] <ref> <newvalue> [<oldvalue>])

DESCRIPTION

@@ -297,6 +297,8 @@ if they start with "refs/": otherwise it will just try to read them and update them as a regular file (i.e. it will allow the filesystem to follow them, but will overwrite such a symlink to somewhere else with a regular filename).

+

If --no-deref is given, <ref> itself is overwritten, rather than +the result of following the symbolic pointers.

In general, using

@@ -358,7 +360,7 @@ or does not have committer information available.

diff --git a/git-update-ref.txt b/git-update-ref.txt index 9424feab3..f22261659 100644 --- a/git-update-ref.txt +++ b/git-update-ref.txt @@ -7,7 +7,7 @@ git-update-ref - Update the object name stored in a ref safely SYNOPSIS -------- -'git-update-ref' [-m ] (-d | []) +'git-update-ref' [-m ] (-d | [--no-deref] []) DESCRIPTION ----------- @@ -36,6 +36,9 @@ them and update them as a regular file (i.e. it will allow the filesystem to follow them, but will overwrite such a symlink to somewhere else with a regular filename). +If --no-deref is given, itself is overwritten, rather than +the result of following the symbolic pointers. + In general, using git-update-ref HEAD "$head" -- 2.26.2