From 47c1e3ca86a9871867627dd09e64ae4dce79ed32 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 25 Sep 2006 04:45:55 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.2.1-g83915 --- config.txt | 7 +++++ git-daemon.html | 64 +++++++++++++++++++++++++++++++++++++++++++- git-daemon.txt | 47 ++++++++++++++++++++++++++++++++ git-repo-config.html | 19 ++++++++++++- git-rev-list.html | 21 ++++++++++++++- git-rev-list.txt | 11 ++++++++ git-svn.html | 17 +++++++++++- git-svn.txt | 12 +++++++++ git-tar-tree.html | 4 ++- git-tar-tree.txt | 3 +++ git-upload-tar.txt | 39 --------------------------- git.html | 11 +------- git.txt | 4 --- 13 files changed, 201 insertions(+), 58 deletions(-) delete mode 100644 git-upload-tar.txt diff --git a/config.txt b/config.txt index bb2fbc324..98c1f3e2e 100644 --- a/config.txt +++ b/config.txt @@ -119,6 +119,13 @@ apply.whitespace:: Tells `git-apply` how to handle whitespaces, in the same way as the '--whitespace' option. See gitlink:git-apply[1]. +branch..remote:: + When in branch , it tells `git fetch` which remote to fetch. + +branch..merge:: + When in branch , it tells `git fetch` the default remote branch + to be merged. + pager.color:: A boolean to enable/disable colored output when the pager is in use (default is true). diff --git a/git-daemon.html b/git-daemon.html index 57ed3ccac..d2ff3cabf 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -276,6 +276,7 @@ git-daemon(1) Manual Page
git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all] [--timeout=n] [--init-timeout=n] [--strict-paths] [--base-path=path] [--user-path | --user-path=path] + [--interpolated-path=pathtemplate] [--enable=service] [--disable=service] [--allow-override=service] [--forbid-override=service] [--reuseaddr] [--detach] [--pid-file=file] @@ -324,6 +325,17 @@ git repositories.

+--interpolated-path=pathtemplate +
+
+

+ To support virtual hosting, an interpolated path template can be + used to dynamically construct alternate paths. The template + supports %H for the target hostname as supplied by the client, + and %D for the absolute path of the named repository. +

+
+
--export-all
@@ -491,6 +503,56 @@ upload-pack
+

EXAMPLES

+
+
+
+git-daemon as inetd server +
+
+

+ To set up git-daemon as an inetd service that handles any + repository under the whitelisted set of directories, /pub/foo + and /pub/bar, place an entry like the following into + /etc/inetd all on one line: +

+
+
+
        git stream tcp nowait nobody  /usr/bin/git-daemon
+                git-daemon --inetd --verbose
+                --syslog --export-all
+                /pub/foo /pub/bar
+
+
+
+git-daemon as inetd server for virtual hosts +
+
+

+ To set up git-daemon as an inetd service that handles + repositories for different virtual hosts, www.example.com + and www.example.org, place an entry like the following into + /etc/inetd all on one line: +

+
+
+
        git stream tcp nowait nobody /usr/bin/git-daemon
+                git-daemon --inetd --verbose
+                --syslog --export-all
+                --interpolated-path=/pub/%H%D
+                /pub/www.example.org/software
+                /pub/www.example.com/software
+                /software
+
+

In this example, the root-level directory /pub will contain +a subdirectory for each virtual host name supported. +Further, both hosts advertise repositories simply as +git://www.example.com/software/repo.git. For pre-1.4.0 +clients, a symlink from /software into the appropriate +default repository could be made as well.

+
+
+

Author

Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki @@ -506,7 +568,7 @@ upload-pack

diff --git a/git-daemon.txt b/git-daemon.txt index 741f2c69b..51d7c94d7 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -11,6 +11,7 @@ SYNOPSIS 'git-daemon' [--verbose] [--syslog] [--inetd | --port=n] [--export-all] [--timeout=n] [--init-timeout=n] [--strict-paths] [--base-path=path] [--user-path | --user-path=path] + [--interpolated-path=pathtemplate] [--enable=service] [--disable=service] [--allow-override=service] [--forbid-override=service] [--reuseaddr] [--detach] [--pid-file=file] @@ -50,6 +51,12 @@ OPTIONS 'git://example.com/hello.git', `git-daemon` will interpret the path as '/srv/git/hello.git'. +--interpolated-path=pathtemplate:: + To support virtual hosting, an interpolated path template can be + used to dynamically construct alternate paths. The template + supports %H for the target hostname as supplied by the client, + and %D for the absolute path of the named repository. + --export-all:: Allow pulling from all directories that look like GIT repositories (have the 'objects' and 'refs' subdirectories), even if they @@ -135,6 +142,46 @@ upload-pack:: disable it by setting `daemon.uploadpack` configuration item to `false`. +EXAMPLES +-------- +git-daemon as inetd server:: + To set up `git-daemon` as an inetd service that handles any + repository under the whitelisted set of directories, /pub/foo + and /pub/bar, place an entry like the following into + /etc/inetd all on one line: ++ +------------------------------------------------ + git stream tcp nowait nobody /usr/bin/git-daemon + git-daemon --inetd --verbose + --syslog --export-all + /pub/foo /pub/bar +------------------------------------------------ + + +git-daemon as inetd server for virtual hosts:: + To set up `git-daemon` as an inetd service that handles + repositories for different virtual hosts, `www.example.com` + and `www.example.org`, place an entry like the following into + `/etc/inetd` all on one line: ++ +------------------------------------------------ + git stream tcp nowait nobody /usr/bin/git-daemon + git-daemon --inetd --verbose + --syslog --export-all + --interpolated-path=/pub/%H%D + /pub/www.example.org/software + /pub/www.example.com/software + /software +------------------------------------------------ ++ +In this example, the root-level directory `/pub` will contain +a subdirectory for each virtual host name supported. +Further, both hosts advertise repositories simply as +`git://www.example.com/software/repo.git`. For pre-1.4.0 +clients, a symlink from `/software` into the appropriate +default repository could be made as well. + + Author ------ Written by Linus Torvalds , YOSHIFUJI Hideaki diff --git a/git-repo-config.html b/git-repo-config.html index 2cb8c4bee..210f8b74b 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -687,6 +687,23 @@ apply.whitespace

+branch.<name>.remote +
+
+

+ When in branch <name>, it tells git fetch which remote to fetch. +

+
+
+branch.<name>.merge +
+
+

+ When in branch <name>, it tells git fetch the default remote branch + to be merged. +

+
+
pager.color
@@ -1007,7 +1024,7 @@ receive.denyNonFastforwads diff --git a/git-rev-list.html b/git-rev-list.html index 80834c039..c7304e87f 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -284,6 +284,7 @@ git-rev-list(1) Manual Page [ --stdin ] [ --topo-order ] [ --parents ] + [ --(author|committer|grep)=<pattern> ] [ [--objects | --objects-edge] [ --unpacked ] ] [ --pretty | --header ] [ --bisect ] @@ -454,6 +455,24 @@ limiting may be applied.

+--author=pattern, --committer=pattern +
+
+

+ Limit the commits output to ones with author/committer + header lines that match the specified pattern. +

+
+
+--grep=pattern +
+
+

+ Limit the commits output to ones with log message that + matches the specified pattern. +

+
+
--remove-empty
@@ -626,7 +645,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-list.txt b/git-rev-list.txt index 28966adbb..00a95e249 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -20,6 +20,7 @@ SYNOPSIS [ \--stdin ] [ \--topo-order ] [ \--parents ] + [ \--(author|committer|grep)= ] [ [\--objects | \--objects-edge] [ \--unpacked ] ] [ \--pretty | \--header ] [ \--bisect ] @@ -154,6 +155,16 @@ limiting may be applied. Limit the commits output to specified time range. +--author='pattern', --committer='pattern':: + + Limit the commits output to ones with author/committer + header lines that match the specified pattern. + +--grep='pattern':: + + Limit the commits output to ones with log message that + matches the specified pattern. + --remove-empty:: Stop when a given path disappears from the tree. diff --git a/git-svn.html b/git-svn.html index e237851e4..fd03854e5 100644 --- a/git-svn.html +++ b/git-svn.html @@ -580,6 +580,21 @@ enabled for them.

doing.

repo-config key: svn.noignoreexternals

+
+--ignore-nodate +
+
+

+Only used with the fetch command. +

+

By default git-svn will crash if it tries to import a revision +from SVN which has (no date) listed as the date of the revision. +This is repository corruption on SVN's part, plain and simple. +But sometimes you really need those revisions anyway.

+

If supplied git-svn will convert (no date) entries to the UNIX +epoch (midnight on Jan. 1, 1970). Yes, that's probably very wrong. +SVN was very wrong.

+

Basic Examples

Tracking and contributing to an Subversion managed-project:

@@ -714,7 +729,7 @@ detect them.

diff --git a/git-svn.txt b/git-svn.txt index b7b63f713..1cfa3e342 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -244,6 +244,18 @@ doing. repo-config key: svn.noignoreexternals +--ignore-nodate:: +Only used with the 'fetch' command. + +By default git-svn will crash if it tries to import a revision +from SVN which has '(no date)' listed as the date of the revision. +This is repository corruption on SVN's part, plain and simple. +But sometimes you really need those revisions anyway. + +If supplied git-svn will convert '(no date)' entries to the UNIX +epoch (midnight on Jan. 1, 1970). Yes, that's probably very wrong. +SVN was very wrong. + -- Basic Examples diff --git a/git-tar-tree.html b/git-tar-tree.html index eebacd38d..6b32fcd46 100644 --- a/git-tar-tree.html +++ b/git-tar-tree.html @@ -276,6 +276,8 @@ git-tar-tree(1) Manual Page

DESCRIPTION

+

THIS COMMAND IS DEPRECATED. Use git-archive with --format=tar +option instead.

Creates a tar archive containing the tree structure for the named tree. When <base> is specified it is added as a leading path to the files in the generated tar archive.

@@ -393,7 +395,7 @@ git tar-tree HEAD:Documentation/ git-docs > git-1.4.0-docs.tar
diff --git a/git-tar-tree.txt b/git-tar-tree.txt index 1e1c7fa85..74a6fddd9 100644 --- a/git-tar-tree.txt +++ b/git-tar-tree.txt @@ -12,6 +12,9 @@ SYNOPSIS DESCRIPTION ----------- +THIS COMMAND IS DEPRECATED. Use `git-archive` with `--format=tar` +option instead. + Creates a tar archive containing the tree structure for the named tree. When is specified it is added as a leading path to the files in the generated tar archive. diff --git a/git-upload-tar.txt b/git-upload-tar.txt deleted file mode 100644 index 394af6201..000000000 --- a/git-upload-tar.txt +++ /dev/null @@ -1,39 +0,0 @@ -git-upload-tar(1) -================= - -NAME ----- -git-upload-tar - Send tar archive - - -SYNOPSIS --------- -'git-upload-tar' - -DESCRIPTION ------------ -Invoked by 'git-tar-tree --remote' and sends a generated tar archive -to the other end over the git protocol. - -This command is usually not invoked directly by the end user. -The UI for the protocol is on the 'git-tar-tree' side, and the -program pair is meant to be used to get a tar archive from a -remote repository. - - -OPTIONS -------- -:: - The repository to get a tar archive from. - -Author ------- -Written by Junio C Hamano - -Documentation --------------- -Documentation by Junio C Hamano. - -GIT ---- -Part of the gitlink:git[7] suite diff --git a/git.html b/git.html index 023fb273e..73ea3378b 100644 --- a/git.html +++ b/git.html @@ -762,15 +762,6 @@ the working tree.

what are asked for.

-
-git-upload-tar(1) -
-
-

- Invoked by git-tar-tree --remote to return the tar - archive the other end asked for. -

-

High-level commands (porcelain)

@@ -2173,7 +2164,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 744c38dee..1bf5ef57e 100644 --- a/git.txt +++ b/git.txt @@ -247,10 +247,6 @@ gitlink:git-upload-pack[1]:: Invoked by 'git-fetch-pack' to push what are asked for. -gitlink:git-upload-tar[1]:: - Invoked by 'git-tar-tree --remote' to return the tar - archive the other end asked for. - High-level commands (porcelain) ------------------------------- -- 2.26.2