From 58155b42e7f69f920b962bc43de04ec3bb48df87 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 15 Sep 2007 07:46:14 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3.1-91-gd3392 --- config.txt | 10 +++++++++- git-archive.html | 7 ++++--- git-archive.txt | 5 +++-- git-config.html | 34 +++++++++++++++++++++++++--------- git-config.txt | 2 +- git-ls-files.html | 16 ++++++++++++++-- git-ls-files.txt | 9 ++++++++- git-pack-objects.html | 15 ++++++++++++++- git-pack-objects.txt | 8 ++++++++ git-remote.html | 7 +++++-- git-remote.txt | 6 +++++- 11 files changed, 96 insertions(+), 23 deletions(-) diff --git a/config.txt b/config.txt index 866e0534b..015910f27 100644 --- a/config.txt +++ b/config.txt @@ -630,9 +630,17 @@ pack.deltaCacheSize:: A value of 0 means no limit. Defaults to 0. pack.deltaCacheLimit:: - The maxium size of a delta, that is cached in + The maximum size of a delta, that is cached in gitlink:git-pack-objects[1]. Defaults to 1000. +pack.threads:: + Specifies the number of threads to spawn when searching for best + delta matches. This requires that gitlink:git-pack-objects[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. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once. diff --git a/git-archive.html b/git-archive.html index 402de7cee..5948cc678 100644 --- a/git-archive.html +++ b/git-archive.html @@ -279,7 +279,8 @@ git-archive(1) Manual Page

DESCRIPTION

Creates an archive of the specified format containing the tree -structure for the named tree. If <prefix> is specified it is +structure for the named tree, and writes it out to the standard +output. If <prefix> is specified it is prepended to the filenames in the archive.

git-archive behaves differently when given a tree ID versus when given a commit ID or tag ID. In the first case the current time is @@ -298,7 +299,7 @@ comment.

- Format of the resulting archive: tar, zip… The default + Format of the resulting archive: tar or zip. The default is tar.

@@ -458,7 +459,7 @@ git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-d
diff --git a/git-archive.txt b/git-archive.txt index f2080eb6a..e1e2d60fe 100644 --- a/git-archive.txt +++ b/git-archive.txt @@ -15,7 +15,8 @@ SYNOPSIS DESCRIPTION ----------- Creates an archive of the specified format containing the tree -structure for the named tree. If is specified it is +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. 'git-archive' behaves differently when given a tree ID versus when @@ -31,7 +32,7 @@ OPTIONS ------- --format=:: - Format of the resulting archive: 'tar', 'zip'... The default + Format of the resulting archive: 'tar' or 'zip'. The default is 'tar'. --list, -l:: diff --git a/git-config.html b/git-config.html index 7ec3b96d3..5f353cb0a 100644 --- a/git-config.html +++ b/git-config.html @@ -504,15 +504,18 @@ rather than from all available files.

If not set explicitly with --file, there are three files where git-config will search for configuration options:

-
-
git/config::
-
-
Repository specific configuration file. (The filename is
-of course relative to the repository root, not the working
-directory.)
-
+$GIT_DIR/config +
+
+

+ Repository specific configuration file. (The filename is + of course relative to the repository root, not the working + directory.) +

+
+
~/.gitconfig
@@ -1659,11 +1662,24 @@ pack.deltaCacheLimit

- The maxium size of a delta, that is cached in + The maximum size of a delta, that is cached in git-pack-objects(1). Defaults to 1000.

+pack.threads +
+
+

+ Specifies the number of threads to spawn when searching for best + delta matches. This requires that git-pack-objects(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. +

+
+
pull.octopus
@@ -1891,7 +1907,7 @@ transfer.unpackLimit
diff --git a/git-config.txt b/git-config.txt index 5b794f439..a592b61e2 100644 --- a/git-config.txt +++ b/git-config.txt @@ -142,7 +142,7 @@ FILES If not set explicitly with '--file', there are three files where git-config will search for configuration options: -.git/config:: +$GIT_DIR/config:: Repository specific configuration file. (The filename is of course relative to the repository root, not the working directory.) diff --git a/git-ls-files.html b/git-ls-files.html index 7bb361d21..bb04e01ef 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -279,7 +279,7 @@ git-ls-files(1) Manual Page [-x <pattern>|--exclude=<pattern>] [-X <file>|--exclude-from=<file>] [--exclude-per-directory=<file>] - [--error-unmatch] + [--error-unmatch] [--with-tree=<tree-ish>] [--full-name] [--abbrev] [--] [<file>]*

DESCRIPTION

@@ -421,6 +421,18 @@ shown:

+--with-tree=<tree-ish> +
+
+

+ When using --error-unmatch to expand the user supplied + <file> (i.e. path pattern) arguments to paths, pretend + that paths which were removed in the index since the + named <tree-ish> are still present. Using this option + with -s or -u options does not make any sense. +

+
+
-t
@@ -603,7 +615,7 @@ pattern file appears in.

diff --git a/git-ls-files.txt b/git-ls-files.txt index 997594549..9e454f0a4 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -15,7 +15,7 @@ SYNOPSIS [-x |--exclude=] [-X |--exclude-from=] [--exclude-per-directory=] - [--error-unmatch] + [--error-unmatch] [--with-tree=] [--full-name] [--abbrev] [--] []\* DESCRIPTION @@ -81,6 +81,13 @@ OPTIONS If any does not appear in the index, treat this as an error (return 1). +--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. + -t:: Identify the file status with the following tags (followed by a space) at the start of each line: diff --git a/git-pack-objects.html b/git-pack-objects.html index 7a41e2854..ed4a2ee1b 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -519,6 +519,19 @@ base-name

+--threads=<n> +
+
+

+ 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. +

+
+
--index-version=<version>[,<offset>]
@@ -550,7 +563,7 @@ base-name diff --git a/git-pack-objects.txt b/git-pack-objects.txt index f8a0be351..628f296ce 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt @@ -169,6 +169,14 @@ base-name:: length, this option typically shrinks the resulting packfile by 3-5 per-cent. +--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. + --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 diff --git a/git-remote.html b/git-remote.html index 6b26c16aa..4aab497aa 100644 --- a/git-remote.html +++ b/git-remote.html @@ -274,7 +274,7 @@ git-remote(1) Manual Page
git-remote -git-remote add [-t <branch>] [-m <branch>] [-f] <name> <url> +git-remote add [-t <branch>] [-m <branch>] [-f] [--mirror] <name> <url> git-remote show <name> git-remote prune <name> git-remote update [group]
@@ -307,6 +307,9 @@ multiple branches without grabbing all branches.

With -m <master> option, $GIT_DIR/remotes/<name>/HEAD is set up to point at remote's <master> 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 refs/remotes/ namespace, but in refs/heads/. This option +only makes sense in bare repositories.

show @@ -415,7 +418,7 @@ $ git merge origin diff --git a/git-remote.txt b/git-remote.txt index 61a6022ce..94b9f1777 100644 --- a/git-remote.txt +++ b/git-remote.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git-remote' -'git-remote' add [-t ] [-m ] [-f] +'git-remote' add [-t ] [-m ] [-f] [--mirror] 'git-remote' show 'git-remote' prune 'git-remote' update [group] @@ -45,6 +45,10 @@ 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 'refs/remotes/' namespace, but in 'refs/heads/'. This option +only makes sense in bare repositories. 'show':: -- 2.26.2