From 21e7f9c0020a4f8aa39715acfabba4b5419f6bd4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 31 Aug 2007 07:56:26 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc7-16-ge340d --- RelNotes-1.5.3.txt | 14 +++++++++++++- git-daemon.html | 41 ++++++++++++++++++++++++++++++++++++++--- git-daemon.txt | 36 ++++++++++++++++++++++++++++++++++-- git-filter-branch.html | 14 ++++++++++++-- git-filter-branch.txt | 7 ++++++- 5 files changed, 103 insertions(+), 9 deletions(-) diff --git a/RelNotes-1.5.3.txt b/RelNotes-1.5.3.txt index f2efaaffb..51ff53b37 100644 --- a/RelNotes-1.5.3.txt +++ b/RelNotes-1.5.3.txt @@ -333,8 +333,20 @@ this release, unless otherwise noted. - "git --bare command" overrode existing GIT_DIR setting and always made it treat the current working directory as GIT_DIR. + - "git ls-files --error-unmatch" does not complain if you give the + same path pattern twice by mistake. + + - "git init" autodetected core.filemode but not core.symlinks, which + made a new directory created automatically by "git clone" cumbersome + to use on filesystems that require these configurations to be set. + + - "git log" family of commands behaved differently when run as "git + log" (no pathspec) and as "git log --" (again, no pathspec). This + inconsistency was introduced somewhere in v1.3.0 series but now has + been corrected. + -- exec >/var/tmp/1 -O=v1.5.3-rc7 +O=v1.5.3-rc7-15-ga65f200 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/git-daemon.html b/git-daemon.html index 5e2845b1b..8b1556658 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -465,7 +465,8 @@ git repositories.

- Save the process id in file. + Save the process id in file. Ignored when the daemon + is run under --inetd.

@@ -519,6 +520,12 @@ the facility of inet daemon to achieve the same before spawning

SERVICES

+

These services can be globally enabled/disabled using the +command line options of this command. If a finer-grained +control is desired (e.g. to allow git-archive to be run +against only in a few selected repositories the daemon serves), +the per-repository configuration file can be used to enable or +disable them.

upload-pack @@ -536,7 +543,24 @@ upload-archive

- This serves git-archive --remote. + This serves git-archive --remote. It is disabled by + default, but a repository can enable it by setting + daemon.uploadarchive configuration item to true. +

+
+
+receive-pack +
+
+

+ This serves git-send-pack clients, allowing anonymous + push. It is disabled by default, as there is _no_ + authentication in the protocol (in other words, anybody + can push anything into the repository, including removal + of refs). This is solely meant for a closed LAN setting + where everybody is friendly. This service can be + enabled by daemon.receivepack configuration item to + true.

@@ -619,6 +643,17 @@ Repositories can still be accessed by hostname though, assuming they correspond to these IP addresses.

+

To enable git-archive --remote and disable git-fetch against +a repository, have the following in the configuration file in the +repository (that is the file config next to HEAD, refs and +objects).

+

+

+
+
+
[daemon]
+        uploadpack = false
+        uploadarchive = true
+

Author

@@ -635,7 +670,7 @@ they correspond to these IP addresses.

diff --git a/git-daemon.txt b/git-daemon.txt index f902161c0..efdcdadea 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -124,7 +124,8 @@ OPTIONS Detach from the shell. Implies --syslog. --pid-file=file:: - Save the process id in 'file'. + Save the process id in 'file'. Ignored when the daemon + is run under `--inetd`. --user=user, --group=group:: Change daemon's uid and gid before entering the service loop. @@ -157,6 +158,13 @@ the facility of inet daemon to achieve the same before spawning SERVICES -------- +These services can be globally enabled/disabled using the +command line options of this command. If a finer-grained +control is desired (e.g. to allow `git-archive` to be run +against only in a few selected repositories the daemon serves), +the per-repository configuration file can be used to enable or +disable them. + upload-pack:: This serves `git-fetch-pack` and `git-peek-remote` clients. It is enabled by default, but a repository can @@ -164,7 +172,19 @@ upload-pack:: item to `false`. upload-archive:: - This serves `git-archive --remote`. + This serves `git-archive --remote`. It is disabled by + default, but a repository can enable it by setting + `daemon.uploadarchive` configuration item to `true`. + +receive-pack:: + This serves `git-send-pack` clients, allowing anonymous + push. It is disabled by default, as there is _no_ + authentication in the protocol (in other words, anybody + can push anything into the repository, including removal + of refs). This is solely meant for a closed LAN setting + where everybody is friendly. This service can be + enabled by `daemon.receivepack` configuration item to + `true`. EXAMPLES -------- @@ -229,6 +249,18 @@ Repositories can still be accessed by hostname though, assuming they correspond to these IP addresses. +To enable `git-archive --remote` and disable `git-fetch` against +a repository, have the following in the configuration file in the +repository (that is the file 'config' next to 'HEAD', 'refs' and +'objects'). ++ +---------------------------------------------------------------- +[daemon] + uploadpack = false + uploadarchive = true +---------------------------------------------------------------- + + Author ------ Written by Linus Torvalds , YOSHIFUJI Hideaki diff --git a/git-filter-branch.html b/git-filter-branch.html index 0c418805a..2a3baf81b 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -277,7 +277,8 @@ git-filter-branch(1) Manual Page [--index-filter <command>] [--parent-filter <command>] [--msg-filter <command>] [--commit-filter <command>] [--tag-name-filter <command>] [--subdirectory-filter <directory>] - [-d <directory>] [-f | --force] [<rev-list options>…] + [--original <namespace>] [-d <directory>] [-f | --force] + [<rev-list options>…]

DESCRIPTION

@@ -427,6 +428,15 @@ definition impossible to preserve signatures at any rate.)

+--original <namespace> +
+
+

+ Use this option to set the namespace where the original commits + will be stored. The default value is refs/original. +

+
+
-d <directory>
@@ -572,7 +582,7 @@ and the git list <git@vger.kernel.org>

diff --git a/git-filter-branch.txt b/git-filter-branch.txt index 8c43be611..ae03514e4 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -12,7 +12,8 @@ SYNOPSIS [--index-filter ] [--parent-filter ] [--msg-filter ] [--commit-filter ] [--tag-name-filter ] [--subdirectory-filter ] - [-d ] [-f | --force] [...] + [--original ] [-d ] [-f | --force] + [...] DESCRIPTION ----------- @@ -134,6 +135,10 @@ definition impossible to preserve signatures at any rate.) The result will contain that directory (and only that) as its project root. +--original :: + Use this option to set the namespace where the original commits + will be stored. The default value is 'refs/original'. + -d :: Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to -- 2.26.2