diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-daemon.txt | 16 | ||||
| -rw-r--r-- | Documentation/pull-fetch-param.txt | 7 |
2 files changed, 18 insertions, 5 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 3783858302..972e0e1571 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -29,9 +29,15 @@ This is ideally suited for read-only updates, ie pulling from git repositories. OPTIONS ------- ++--strict-paths:: + Match paths exactly (i.e. don't allow "/foo/repo" when the real path is + "/foo/repo.git" or "/foo/repo/.git") and don't do user-relative paths. + git-daemon will refuse to start when this option is enabled and no + whitelist is specified. + --export-all:: Allow pulling from all directories that look like GIT repositories - (have the 'objects' subdirectory and a 'HEAD' file), even if they + (have the 'objects' and 'refs' subdirectories), even if they do not have the 'git-daemon-export-ok' file. --inetd:: @@ -57,9 +63,15 @@ OPTIONS --verbose:: Log details about the incoming connections and requested files. +<directory>:: + A directory to add to the whitelist of allowed directories. Unless + --strict-paths is specified this will also include subdirectories + of each named directory. + Author ------ -Written by Linus Torvalds <torvalds@osdl.org> and YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> +Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki +<yoshfuji@linux-ipv6.org> and the git-list <git@vger.kernel.org> Documentation -------------- diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index a7628aa34b..6413d525ce 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -9,15 +9,16 @@ - http://host.xz/path/to/repo.git/ - https://host.xz/path/to/repo.git/ - git://host.xz/path/to/repo.git/ +- git://host.xz/~user/path/to/repo.git/ - ssh://host.xz/path/to/repo.git/ - ssh://host.xz/~user/path/to/repo.git/ - ssh://host.xz/~/path/to/repo.git =============================================================== + SSH Is the default transport protocol and also supports an - scp-like syntax. Both syntaxes support username expansion. - The following three are identical to the last three above, - respectively: + scp-like syntax. Both syntaxes support username expansion, + as does the native git protocol. The following three are + identical to the last three above, respectively: + =============================================================== - host.xz:/path/to/repo.git/ |