Autogenerated HTML docs for v1.5.3-rc3-107-g73a7

diff --git a/git-config.html b/git-config.html
index 49295b7deef8819a62a0e4d977d05dc526656877..61fa4723c0f83b6cafc03780eb66074ebbfa97f9 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -273,17 +273,17 @@ git-config(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-config</em> [--system | --global] [type] [-z|--null] name [value [value_regex]]\r
-<em>git-config</em> [--system | --global] [type] --add name value\r
-<em>git-config</em> [--system | --global] [type] --replace-all name [value [value_regex]]\r
-<em>git-config</em> [--system | --global] [type] [-z|--null] --get name [value_regex]\r
-<em>git-config</em> [--system | --global] [type] [-z|--null] --get-all name [value_regex]\r
-<em>git-config</em> [--system | --global] [type] [-z|--null] --get-regexp name_regex [value_regex]\r
-<em>git-config</em> [--system | --global] --unset name [value_regex]\r
-<em>git-config</em> [--system | --global] --unset-all name [value_regex]\r
-<em>git-config</em> [--system | --global] --rename-section old_name new_name\r
-<em>git-config</em> [--system | --global] --remove-section name\r
-<em>git-config</em> [--system | --global] [-z|--null] -l | --list</div></div>\r
+<div class="content"><em>git-config</em> [&lt;file-option&gt;] [type] [-z|--null] name [value [value_regex]]\r
+<em>git-config</em> [&lt;file-option&gt;] [type] --add name value\r
+<em>git-config</em> [&lt;file-option&gt;] [type] --replace-all name [value [value_regex]]\r
+<em>git-config</em> [&lt;file-option&gt;] [type] [-z|--null] --get name [value_regex]\r
+<em>git-config</em> [&lt;file-option&gt;] [type] [-z|--null] --get-all name [value_regex]\r
+<em>git-config</em> [&lt;file-option&gt;] [type] [-z|--null] --get-regexp name_regex [value_regex]\r
+<em>git-config</em> [&lt;file-option&gt;] --unset name [value_regex]\r
+<em>git-config</em> [&lt;file-option&gt;] --unset-all name [value_regex]\r
+<em>git-config</em> [&lt;file-option&gt;] --rename-section old_name new_name\r
+<em>git-config</em> [&lt;file-option&gt;] --remove-section name\r
+<em>git-config</em> [&lt;file-option&gt;] [-z|--null] -l | --list</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -301,16 +301,21 @@ prepend a single exclamation mark in front (see also <a href="#EXAMPLES">[EXAMPL
 convert the value to the canonical form (simple decimal number for int,\r
 a "true" or "false" string for bool).  If no type specifier is passed,\r
 no checks or transformations are performed on the value.</p>\r
+<p>The file-option can be one of <em>--system</em>, <em>--global</em> or <em>--file</em>\r
+which specify where the values will be read from or written to.\r
+The default is to assume the config file of the current repository,\r
+.git/config unless defined otherwise with GIT_DIR and GIT_CONFIG\r
+(see <a href="#FILES">[FILES]</a>).</p>\r
 <p>This command will fail if:</p>\r
 <ol>\r
 <li>\r
 <p>\r
-The .git/config file is invalid,\r
+The config file is invalid,\r
 </p>\r
 </li>\r
 <li>\r
 <p>\r
-Can not write to .git/config,\r
+Can not write to the config file,\r
 </p>\r
 </li>\r
 <li>\r
@@ -414,6 +419,14 @@ rather than from all available files.</p>
 <p>See also <a href="#FILES">[FILES]</a>.</p>\r
 </dd>\r
 <dt>\r
+-f config-file, --file config-file\r
+</dt>\r
+<dd>\r
+<p>\r
+        Use the given config file instead of the one specified by GIT_CONFIG.\r
+</p>\r
+</dd>\r
+<dt>\r
 --remove-section\r
 </dt>\r
 <dd>\r
@@ -489,8 +502,8 @@ rather than from all available files.</p>
 </div>\r
 <h2><a id="FILES"></a>FILES</h2>\r
 <div class="sectionbody">\r
-<p>There are three files where git-config will search for configuration\r
-options:</p>\r
+<p>If not set explicitely with <em>--file</em>, there are three files where\r
+git-config will search for configuration options:</p>\r
 <div class="literalblock">\r
 <div class="title">git/config::</div>\r
 <div class="content">\r
@@ -1872,7 +1885,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 27-Jul-2007 07:25:18 UTC\r
+Last updated 01-Aug-2007 08:42:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-config.txt b/git-config.txt
index 5f66a7fcd5907b26ff6bdf94b53c2619c1eff509..8451cccf8a34d73a3b6b74be53af8ad110fc9f09 100644 (file)
--- a/git-config.txt
+++ b/git-config.txt
@@ -9,17 +9,17 @@ git-config - Get and set repository or global options
 SYNOPSIS
 --------
 [verse]
-'git-config' [--system | --global] [type] [-z|--null] name [value [value_regex]]
-'git-config' [--system | --global] [type] --add name value
-'git-config' [--system | --global] [type] --replace-all name [value [value_regex]]
-'git-config' [--system | --global] [type] [-z|--null] --get name [value_regex]
-'git-config' [--system | --global] [type] [-z|--null] --get-all name [value_regex]
-'git-config' [--system | --global] [type] [-z|--null] --get-regexp name_regex [value_regex]
-'git-config' [--system | --global] --unset name [value_regex]
-'git-config' [--system | --global] --unset-all name [value_regex]
-'git-config' [--system | --global] --rename-section old_name new_name
-'git-config' [--system | --global] --remove-section name
-'git-config' [--system | --global] [-z|--null] -l | --list
+'git-config' [<file-option>] [type] [-z|--null] name [value [value_regex]]
+'git-config' [<file-option>] [type] --add name value
+'git-config' [<file-option>] [type] --replace-all name [value [value_regex]]
+'git-config' [<file-option>] [type] [-z|--null] --get name [value_regex]
+'git-config' [<file-option>] [type] [-z|--null] --get-all name [value_regex]
+'git-config' [<file-option>] [type] [-z|--null] --get-regexp name_regex [value_regex]
+'git-config' [<file-option>] --unset name [value_regex]
+'git-config' [<file-option>] --unset-all name [value_regex]
+'git-config' [<file-option>] --rename-section old_name new_name
+'git-config' [<file-option>] --remove-section name
+'git-config' [<file-option>] [-z|--null] -l | --list
 
 DESCRIPTION
 -----------
@@ -40,10 +40,16 @@ convert the value to the canonical form (simple decimal number for int,
 a "true" or "false" string for bool).  If no type specifier is passed,
 no checks or transformations are performed on the value.
 
+The file-option can be one of '--system', '--global' or '--file'
+which specify where the values will be read from or written to.
+The default is to assume the config file of the current repository,
+.git/config unless defined otherwise with GIT_DIR and GIT_CONFIG
+(see <<FILES>>).
+
 This command will fail if:
 
-. The .git/config file is invalid,
-. Can not write to .git/config,
+. The config file is invalid,
+. Can not write to the config file,
 . no section was provided,
 . the section or key is invalid,
 . you try to unset an option which does not exist,
@@ -93,6 +99,9 @@ rather than from all available files.
 +
 See also <<FILES>>.
 
+-f config-file, --file config-file::
+       Use the given config file instead of the one specified by GIT_CONFIG.
+
 --remove-section::
        Remove the given section from the configuration file.
 
@@ -130,8 +139,8 @@ See also <<FILES>>.
 FILES
 -----
 
-There are three files where git-config will search for configuration
-options:
+If not set explicitely with '--file', there are three files where
+git-config will search for configuration options:
 
 .git/config::
        Repository specific configuration file. (The filename is

diff --git a/git-daemon.html b/git-daemon.html
index 606c88b3bbbe1920f957cb443964c4b243982b5d..5e2845b1b36951232823f7f4054b5121a1065753 100644 (file)
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -327,6 +327,17 @@ git repositories.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--base-path-relaxed\r
+</dt>\r
+<dd>\r
+<p>\r
+        If --base-path is enabled and repo lookup fails, with this option\r
+        <tt>git-daemon</tt> will attempt to lookup without prefixing the base path.\r
+        This is useful for switching to --base-path usage, while still\r
+        allowing the old paths.\r
+</p>\r
+</dd>\r
+<dt>\r
 --interpolated-path=pathtemplate\r
 </dt>\r
 <dd>\r
@@ -624,7 +635,7 @@ they correspond to these IP addresses.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:37 UTC\r
+Last updated 01-Aug-2007 08:42:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-daemon.txt b/git-daemon.txt
index 4b30b18b427c6f4922ce44eee68042c036a6e806..f902161c087a34d4e244a516cc6dd2e259af2e2e 100644 (file)
--- a/git-daemon.txt
+++ b/git-daemon.txt
@@ -54,6 +54,12 @@ OPTIONS
        'git://example.com/hello.git', `git-daemon` will interpret the path
        as '/srv/git/hello.git'.
 
+--base-path-relaxed::
+       If --base-path is enabled and repo lookup fails, with this option
+       `git-daemon` will attempt to lookup without prefixing the base path.
+       This is useful for switching to --base-path usage, while still
+       allowing the old paths.
+
 --interpolated-path=pathtemplate::
        To support virtual hosting, an interpolated path template can be
        used to dynamically construct alternate paths.  The template