From: Junio C Hamano Date: Sat, 15 Sep 2007 07:46:16 +0000 (+0000) Subject: Autogenerated manpages for v1.5.3.1-91-gd3392 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9ad6df9cfc7f0946b8bb7e6d86ad8df51f07fcb8;p=git.git Autogenerated manpages for v1.5.3.1-91-gd3392 --- diff --git a/man1/git-archive.1 b/man1/git-archive.1 index 091ac1066..861dd2297 100644 --- a/man1/git-archive.1 +++ b/man1/git-archive.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\-ARCHIVE" "1" "08/23/2007" "Git 1.5.3.rc6.9.gaabb2" "Git Manual" +.TH "GIT\-ARCHIVE" "1" "09/15/2007" "Git 1.5.3.1.91.gd3392" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -16,13 +16,13 @@ git\-archive \- Create an archive of files from a named tree [\-\-remote=] [path\&...] .fi .SH "DESCRIPTION" -Creates an archive of the specified format containing the tree structure for the named tree. If is specified it is prepended to the filenames in the archive. +Creates an archive of the specified format containing the tree structure for the named tree, and writes it out to the standard output. If is specified it is prepended to the filenames in the archive. \fIgit\-archive\fR behaves differently when given a tree ID versus when given a commit ID or tag ID. In the first case the current time is used as modification time of each file in the archive. In the latter case the commit time as recorded in the referenced commit object is used instead. Additionally the commit ID is stored in a global extended pax header if the tar format is used; it can be extracted using \fIgit\-get\-tar\-commit\-id\fR. In ZIP files it is stored as a file comment. .SH "OPTIONS" .TP \-\-format= -Format of the resulting archive: \fItar\fR, \fIzip\fR\&... The default is \fItar\fR. +Format of the resulting archive: \fItar\fR or \fIzip\fR. The default is \fItar\fR. .TP \-\-list, \-l Show all available formats. diff --git a/man1/git-config.1 b/man1/git-config.1 index 857d3d577..c965f8517 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" "09/01/2007" "Git 1.5.3.rc7.30.g947ad2" "Git Manual" +.TH "GIT\-CONFIG" "1" "09/15/2007" "Git 1.5.3.1.91.gd3392" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -114,13 +114,9 @@ git\-config will ensure that the output is a simple decimal number. An optional For all options that output values and/or keys, always end values with with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks. .SH "FILES" If not set explicitly with \fI\-\-file\fR, there are three files where git\-config will search for configuration options: - -Example\ 1.\ git/config::.sp -.nf -Repository specific configuration file. (The filename is -of course relative to the repository root, not the working -directory.) -.fi +.TP +$GIT_DIR/config +Repository specific configuration file. (The filename is of course relative to the repository root, not the working directory.) .TP ~/.gitconfig User\-specific configuration file. Also called "global" configuration file. @@ -587,7 +583,10 @@ pack.deltaCacheSize The maximum memory in bytes used for caching deltas in \fBgit\-pack\-objects\fR(1). A value of 0 means no limit. Defaults to 0. .TP pack.deltaCacheLimit -The maxium size of a delta, that is cached in \fBgit\-pack\-objects\fR(1). Defaults to 1000. +The maximum size of a delta, that is cached in \fBgit\-pack\-objects\fR(1). Defaults to 1000. +.TP +pack.threads +Specifies the number of threads to spawn when searching for best delta matches. This requires that \fBgit\-pack\-objects\fR(1) be compiled with pthreads otherwise this option is ignored with a warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. .TP pull.octopus The default merge strategy to use when pulling multiple branches at once. diff --git a/man1/git-ls-files.1 b/man1/git-ls-files.1 index b83dfe36d..cb06cc9e0 100644 --- a/man1/git-ls-files.1 +++ b/man1/git-ls-files.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\-LS\-FILES" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-LS\-FILES" "1" "09/15/2007" "Git 1.5.3.1.91.gd3392" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -18,7 +18,7 @@ git\-ls\-files \- Show information about files in the index and the working tree [\-x |\-\-exclude=] [\-X |\-\-exclude\-from=] [\-\-exclude\-per\-directory=] - [\-\-error\-unmatch] + [\-\-error\-unmatch] [\-\-with\-tree=] [\-\-full\-name] [\-\-abbrev] [\-\-] []* .fi .SH "DESCRIPTION" @@ -72,6 +72,9 @@ read additional exclude patterns that apply only to the directory and its subdir \-\-error\-unmatch If any does not appear in the index, treat this as an error (return 1). .TP +\-\-with\-tree= +When using \-\-error\-unmatch to expand the user supplied (i.e. path pattern) arguments to paths, pretend that paths which were removed in the index since the named are still present. Using this option with \-s or \-u options does not make any sense. +.TP \-t Identify the file status with the following tags (followed by a space) at the start of each line: diff --git a/man1/git-pack-objects.1 b/man1/git-pack-objects.1 index c52a58df5..fdc237615 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" "09/10/2007" "Git 1.5.3.1.40.g6972" "Git Manual" +.TH "GIT\-PACK\-OBJECTS" "1" "09/15/2007" "Git 1.5.3.1.91.gd3392" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -82,6 +82,9 @@ Specifies compression level for newly\-compressed data in the generated pack. If \-\-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 +\-\-threads= +Specifies the number of threads to spawn when searching for best delta matches. This requires that pack\-objects be compiled with pthreads otherwise this option is ignored with a warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. +.TP \-\-index\-version=[,] This is intended to be used by the test suite only. It allows to force the version for the generated pack index, and to force 64\-bit index entries on objects located above the given offset. .SH "AUTHOR" diff --git a/man1/git-remote.1 b/man1/git-remote.1 index 32c8a5eb8..542227837 100644 --- a/man1/git-remote.1 +++ b/man1/git-remote.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\-REMOTE" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-REMOTE" "1" "09/15/2007" "Git 1.5.3.1.91.gd3392" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -13,7 +13,7 @@ git\-remote \- manage set of tracked repositories .sp .nf \fIgit\-remote\fR -\fIgit\-remote\fR add [\-t ] [\-m ] [\-f] +\fIgit\-remote\fR add [\-t ] [\-m ] [\-f] [\-\-mirror] \fIgit\-remote\fR show \fIgit\-remote\fR prune \fIgit\-remote\fR update [group] @@ -31,6 +31,8 @@ With \-f option, git fetch is run immediately after the remote informatio With \-t option, instead of the default glob refspec for the remote to track all branches under $GIT_DIR/remotes//, a refspec to track only is created. You can give more than one \-t to track multiple branches without grabbing all branches. With \-m option, $GIT_DIR/remotes//HEAD is set up to point at remote's branch instead of whatever branch the HEAD at the remote repository actually points at. + +In mirror mode, enabled with \-\-mirror, the refs will not be stored in the \fIrefs/remotes/\fR namespace, but in \fIrefs/heads/\fR. This option only makes sense in bare repositories. .TP \fIshow\fR Gives some information about the remote .