From 4d04a4022e7f9f3ada3a64e2010ce65e1fcc5c64 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 8 Jan 2006 16:53:28 -0800 Subject: [PATCH] Autogenerated HTML docs for 5a2282de13c4da13f979185e652c8a08e2481fd1 --- fetch-options.txt | 18 +++++++++++++----- git-daemon.html | 18 ++++++++++++++++-- git-daemon.txt | 11 ++++++++++- git-fetch.html | 24 ++++++++++++++++++------ git-pull.html | 24 ++++++++++++++++++------ 5 files changed, 75 insertions(+), 20 deletions(-) diff --git a/fetch-options.txt b/fetch-options.txt index 200c9b24..1fe8423b 100644 --- a/fetch-options.txt +++ b/fetch-options.txt @@ -10,15 +10,23 @@ fetches is a descendant of ``. This option overrides that check. +\--no-tags:: + By default, `git-fetch` fetches tags that point at + objects that are downloaded from the remote repository + and stores them locally. This option disables this + automatic tag following. + -t, \--tags:: - By default, the git core utilities will not fetch and store - tags under the same name as the remote repository; ask it - to do so using `--tags`. Using this option will bound the - list of objects pulled to the remote tags. Commits in branches - beyond the tags will be ignored. + Most of the tags are fetched automatically as branch + heads are downloaded, but tags that do not point at + objects reachable from the branch heads that are being + tracked will not be fetched by this mechanism. This + flag lets all tags and their associated objects be + downloaded. -u, \--update-head-ok:: By default `git-fetch` refuses to update the head which corresponds to the current branch. This flag disables the check. Note that fetching into the current branch will not update the index and working directory, so use it with care. + diff --git a/git-daemon.html b/git-daemon.html index 8899db0b..99d667c6 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -274,7 +274,8 @@ git-daemon(1) Manual Page
git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all] - [--timeout=n] [--init-timeout=n] [--strict-paths] [directory…]
+ [--timeout=n] [--init-timeout=n] [--strict-paths] + [--base-path=path] [directory…]

DESCRIPTION

@@ -305,6 +306,19 @@ the offers to a whitelist comprising of those.

+--base-path +
+
+

+ Remap all the path requests as relative to the given path. + This is sort of "GIT root" - if you run git-daemon with + --base-path=/srv/git on example.com, then if you later try to pull + git://example.com/hello.git, git-daemon will interpret the path + as /srv/git/hello.git. Home directories (the ~login notation) + access is disabled. +

+
+
--export-all
@@ -394,7 +408,7 @@ the offers to a whitelist comprising of those.

diff --git a/git-daemon.txt b/git-daemon.txt index 33f3320e..a20e0533 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -9,7 +9,8 @@ SYNOPSIS -------- [verse] 'git-daemon' [--verbose] [--syslog] [--inetd | --port=n] [--export-all] - [--timeout=n] [--init-timeout=n] [--strict-paths] [directory...] + [--timeout=n] [--init-timeout=n] [--strict-paths] + [--base-path=path] [directory...] DESCRIPTION ----------- @@ -36,6 +37,14 @@ OPTIONS git-daemon will refuse to start when this option is enabled and no whitelist is specified. +--base-path:: + Remap all the path requests as relative to the given path. + This is sort of "GIT root" - if you run git-daemon with + '--base-path=/srv/git' on example.com, then if you later try to pull + 'git://example.com/hello.git', `git-daemon` will interpret the path + as '/srv/git/hello.git'. Home directories (the '~login' notation) + access is disabled. + --export-all:: Allow pulling from all directories that look like GIT repositories (have the 'objects' and 'refs' subdirectories), even if they diff --git a/git-fetch.html b/git-fetch.html index 9d38bb1e..bd071448 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -308,15 +308,27 @@ operation done by "git merge".

+--no-tags +
+
+

+ By default, git-fetch fetches tags that point at + objects that are downloaded from the remote repository + and stores them locally. This option disables this + automatic tag following. +

+
+
-t, --tags

- By default, the git core utilities will not fetch and store - tags under the same name as the remote repository; ask it - to do so using --tags. Using this option will bound the - list of objects pulled to the remote tags. Commits in branches - beyond the tags will be ignored. + Most of the tags are fetched automatically as branch + heads are downloaded, but tags that do not point at + objects reachable from the branch heads that are being + tracked will not be fetched by this mechanism. This + flag lets all tags and their associated objects be + downloaded.

@@ -579,7 +591,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-pull.html b/git-pull.html index 00b74ee2..0f1ba043 100644 --- a/git-pull.html +++ b/git-pull.html @@ -338,15 +338,27 @@ when merging local branches into the current branch.

+--no-tags +
+
+

+ By default, git-fetch fetches tags that point at + objects that are downloaded from the remote repository + and stores them locally. This option disables this + automatic tag following. +

+
+
-t, --tags

- By default, the git core utilities will not fetch and store - tags under the same name as the remote repository; ask it - to do so using --tags. Using this option will bound the - list of objects pulled to the remote tags. Commits in branches - beyond the tags will be ignored. + Most of the tags are fetched automatically as branch + heads are downloaded, but tags that do not point at + objects reachable from the branch heads that are being + tracked will not be fetched by this mechanism. This + flag lets all tags and their associated objects be + downloaded.

@@ -767,7 +779,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

-- 2.11.0