From: Junio C Hamano Date: Sun, 20 May 2007 19:12:11 +0000 (+0000) Subject: Autogenerated manpages for v1.5.2-14-g45bde X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=83d4eac040f55c62c59d22e8e69f8a1f24e50a5c;p=git.git Autogenerated manpages for v1.5.2-14-g45bde --- diff --git a/man1/git-config.1 b/man1/git-config.1 index b23ffa229..d170b808a 100644 --- a/man1/git-config.1 +++ b/man1/git-config.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-CONFIG" "1" "05/09/2007" "Git 1.5.2.rc2.46.g4675" "Git Manual" +.TH "GIT\-CONFIG" "1" "05/20/2007" "Git 1.5.2.14.g45bde" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -298,12 +298,10 @@ core.warnAmbiguousRefs If true, git will warn you if the ref name you passed it is ambiguous and might match multiple refs in the .git/refs/ tree. True by default. .TP 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. .TP -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. +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). .TP core.packedGitWindowSize Number of bytes of a pack file to map into memory in a single mapping operation. Larger window sizes may allow your system to process a smaller number of large pack files more quickly. Smaller window sizes will negatively affect performance due to increased calls to the operating system's memory manager, but may improve performance when accessing a large number of large pack files. @@ -387,6 +385,9 @@ Additional email headers to include in a patch to be submitted by mail. See \fBg format.suffix The default for format\-patch is to output files with the suffix .patch. Use this variable to change that suffix (make sure to include the dot if you want it). .TP +gc.aggressiveWindow +The window size parameter used in the delta compression algorithm used by \fIgit gc \-\-aggressive\fR. This defaults to 10. +.TP 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 from the repository. Setting this to true lets git gc to run git pack\-refs. Setting this to false tells git gc never to run git pack\-refs. The default setting is notbare. Enable it only when you know you do not have to support such clients. The default setting will change to true at some stage, and setting this to false will continue to prevent git pack\-refs from being run from git gc. .TP @@ -479,6 +480,9 @@ The size of the window used by \fBgit\-pack\-objects\fR(1) when no window size i pack.depth The maximum delta depth used by \fBgit\-pack\-objects\fR(1) when no maximum depth is given on the command line. Defaults to 50. .TP +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. +.TP pull.octopus The default merge strategy to use when pulling multiple branches at once. .TP diff --git a/man1/git-gc.1 b/man1/git-gc.1 index 3bb2b9aad..27c07ce1f 100644 --- a/man1/git-gc.1 +++ b/man1/git-gc.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-GC" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual" +.TH "GIT\-GC" "1" "05/20/2007" "Git 1.5.2.14.g45bde" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -10,7 +10,7 @@ .SH "NAME" git\-gc \- Cleanup unnecessary files and optimize the local repository .SH "SYNOPSIS" -\fIgit\-gc\fR [\-\-prune] +\fIgit\-gc\fR [\-\-prune] [\-\-aggressive] .SH "DESCRIPTION" Runs a number of housekeeping tasks within the current repository, such as compressing file revisions (to reduce disk space and increase performance) and removing unreachable objects which may have been created from prior invocations of \fBgit\-add\fR(1). @@ -19,6 +19,9 @@ Users are encouraged to run this task on a regular basis within each repository .TP \-\-prune Usually git\-gc packs refs, expires old reflog entries, packs loose objects, and removes old \fIrerere\fR records. Removal of unreferenced loose objects is an unsafe operation while other git operations are in progress, so it is not done by default. Pass this option if you want it, and only when you know nobody else is creating new objects in the repository at the same time (e.g. never use this option in a cron script). +.TP +\-\-aggressive +Usually \fIgit\-gc\fR 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. .SH "CONFIGURATION" The optional configuration variable \fIgc.reflogExpire\fR can be set to indicate how long historical entries within each branch's reflog should remain available in this repository. The setting is expressed as a length of time, for example \fI90 days\fR or \fI3 months\fR. It defaults to \fI90 days\fR. @@ -29,6 +32,8 @@ The optional configuration variable \fIgc.rerereresolved\fR indicates how long r The optional configuration variable \fIgc.rerereunresolved\fR indicates how long records of conflicted merge you have not resolved are kept. This defaults to 15 days. The optional configuration variable \fIgc.packrefs\fR determines if 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 \fIgc.aggressiveWindow\fR 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 \fBgit\-repack\fR(1) for more details. This defaults to 10. .SH "SEE ALSO" \fBgit\-prune\fR(1) \fBgit\-reflog\fR(1) \fBgit\-repack\fR(1) \fBgit\-rerere\fR(1) .SH "AUTHOR" diff --git a/man1/git-pack-objects.1 b/man1/git-pack-objects.1 index cb5b658e3..fae351e40 100644 --- a/man1/git-pack-objects.1 +++ b/man1/git-pack-objects.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-PACK\-OBJECTS" "1" "05/09/2007" "Git 1.5.2.rc2.46.g4675" "Git Manual" +.TH "GIT\-PACK\-OBJECTS" "1" "05/20/2007" "Git 1.5.2.14.g45bde" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -67,6 +67,12 @@ This flag makes the command not to report its progress on the standard error str \-\-no\-reuse\-delta When creating a packed archive in a repository that has existing packs, the command reuses existing deltas. This sometimes results in a slightly suboptimal pack. This flag tells the command not to reuse existing deltas but compute them from scratch. .TP +\-\-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. +.TP +\-\-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. +.TP \-\-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 stream, but older version of git does not understand the latter. By default, git\-pack\-objects only uses the former format for better compatibility. This option allows the command to use the latter format for compactness. Depending on the average delta chain length, this option typically shrinks the resulting packfile by 3\-5 per\-cent. .TP diff --git a/man1/git-update-ref.1 b/man1/git-update-ref.1 index f5b0081b3..2cf28e61e 100644 --- a/man1/git-update-ref.1 +++ b/man1/git-update-ref.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-UPDATE\-REF" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual" +.TH "GIT\-UPDATE\-REF" "1" "05/20/2007" "Git 1.5.2.14.g45bde" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -10,7 +10,7 @@ .SH "NAME" git\-update\-ref \- Update the object name stored in a ref safely .SH "SYNOPSIS" -\fIgit\-update\-ref\fR [\-m ] (\-d | []) +\fIgit\-update\-ref\fR [\-m ] (\-d | [\-\-no\-deref] []) .SH "DESCRIPTION" Given two arguments, stores the in the , possibly dereferencing the symbolic refs. E.g. git\-update\-ref HEAD updates the current branch head to the new object. @@ -20,6 +20,8 @@ It also allows a "ref" file to be a symbolic pointer to another ref file by star More importantly, it allows the update of a ref file to follow these symbolic pointers, whether they are symlinks or these "regular file symbolic refs". It follows \fBreal\fR symlinks only 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, itself is overwritten, rather than the result of following the symbolic pointers. + In general, using .sp .nf