Skip to content

Commit 0ddc94d

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.5.3-rc3-107-g73a7
1 parent bdeff82 commit 0ddc94d

File tree

4 files changed

+71
-32
lines changed

4 files changed

+71
-32
lines changed

‎git-config.html‎

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -273,17 +273,17 @@ <h2>NAME</h2>
273273
<h2>SYNOPSIS</h2>
274274
<div class="sectionbody">
275275
<div class="verseblock">
276-
<div class="content"><em>git-config</em> [--system | --global] [type] [-z|--null] name [value [value_regex]]
277-
<em>git-config</em> [--system | --global] [type] --add name value
278-
<em>git-config</em> [--system | --global] [type] --replace-all name [value [value_regex]]
279-
<em>git-config</em> [--system | --global] [type] [-z|--null] --get name [value_regex]
280-
<em>git-config</em> [--system | --global] [type] [-z|--null] --get-all name [value_regex]
281-
<em>git-config</em> [--system | --global] [type] [-z|--null] --get-regexp name_regex [value_regex]
282-
<em>git-config</em> [--system | --global] --unset name [value_regex]
283-
<em>git-config</em> [--system | --global] --unset-all name [value_regex]
284-
<em>git-config</em> [--system | --global] --rename-section old_name new_name
285-
<em>git-config</em> [--system | --global] --remove-section name
286-
<em>git-config</em> [--system | --global] [-z|--null] -l | --list</div></div>
276+
<div class="content"><em>git-config</em> [&lt;file-option&gt;] [type] [-z|--null] name [value [value_regex]]
277+
<em>git-config</em> [&lt;file-option&gt;] [type] --add name value
278+
<em>git-config</em> [&lt;file-option&gt;] [type] --replace-all name [value [value_regex]]
279+
<em>git-config</em> [&lt;file-option&gt;] [type] [-z|--null] --get name [value_regex]
280+
<em>git-config</em> [&lt;file-option&gt;] [type] [-z|--null] --get-all name [value_regex]
281+
<em>git-config</em> [&lt;file-option&gt;] [type] [-z|--null] --get-regexp name_regex [value_regex]
282+
<em>git-config</em> [&lt;file-option&gt;] --unset name [value_regex]
283+
<em>git-config</em> [&lt;file-option&gt;] --unset-all name [value_regex]
284+
<em>git-config</em> [&lt;file-option&gt;] --rename-section old_name new_name
285+
<em>git-config</em> [&lt;file-option&gt;] --remove-section name
286+
<em>git-config</em> [&lt;file-option&gt;] [-z|--null] -l | --list</div></div>
287287
</div>
288288
<h2>DESCRIPTION</h2>
289289
<div class="sectionbody">
@@ -301,16 +301,21 @@ <h2>DESCRIPTION</h2>
301301
convert the value to the canonical form (simple decimal number for int,
302302
a "true" or "false" string for bool). If no type specifier is passed,
303303
no checks or transformations are performed on the value.</p>
304+
<p>The file-option can be one of <em>--system</em>, <em>--global</em> or <em>--file</em>
305+
which specify where the values will be read from or written to.
306+
The default is to assume the config file of the current repository,
307+
.git/config unless defined otherwise with GIT_DIR and GIT_CONFIG
308+
(see <a href="#FILES">[FILES]</a>).</p>
304309
<p>This command will fail if:</p>
305310
<ol>
306311
<li>
307312
<p>
308-
The .git/config file is invalid,
313+
The config file is invalid,
309314
</p>
310315
</li>
311316
<li>
312317
<p>
313-
Can not write to .git/config,
318+
Can not write to the config file,
314319
</p>
315320
</li>
316321
<li>
@@ -414,6 +419,14 @@ <h2>OPTIONS</h2>
414419
<p>See also <a href="#FILES">[FILES]</a>.</p>
415420
</dd>
416421
<dt>
422+
-f config-file, --file config-file
423+
</dt>
424+
<dd>
425+
<p>
426+
Use the given config file instead of the one specified by GIT_CONFIG.
427+
</p>
428+
</dd>
429+
<dt>
417430
--remove-section
418431
</dt>
419432
<dd>
@@ -489,8 +502,8 @@ <h2>OPTIONS</h2>
489502
</div>
490503
<h2><a id="FILES"></a>FILES</h2>
491504
<div class="sectionbody">
492-
<p>There are three files where git-config will search for configuration
493-
options:</p>
505+
<p>If not set explicitely with <em>--file</em>, there are three files where
506+
git-config will search for configuration options:</p>
494507
<div class="literalblock">
495508
<div class="title">git/config::</div>
496509
<div class="content">
@@ -1872,7 +1885,7 @@ <h2>GIT</h2>
18721885
</div>
18731886
<div id="footer">
18741887
<div id="footer-text">
1875-
Last updated 27-Jul-2007 07:25:18 UTC
1888+
Last updated 01-Aug-2007 08:42:09 UTC
18761889
</div>
18771890
</div>
18781891
</body>

‎git-config.txt‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ git-config - Get and set repository or global options
99
SYNOPSIS
1010
--------
1111
[verse]
12-
'git-config' [--system | --global] [type] [-z|--null] name [value [value_regex]]
13-
'git-config' [--system | --global] [type] --add name value
14-
'git-config' [--system | --global] [type] --replace-all name [value [value_regex]]
15-
'git-config' [--system | --global] [type] [-z|--null] --get name [value_regex]
16-
'git-config' [--system | --global] [type] [-z|--null] --get-all name [value_regex]
17-
'git-config' [--system | --global] [type] [-z|--null] --get-regexp name_regex [value_regex]
18-
'git-config' [--system | --global] --unset name [value_regex]
19-
'git-config' [--system | --global] --unset-all name [value_regex]
20-
'git-config' [--system | --global] --rename-section old_name new_name
21-
'git-config' [--system | --global] --remove-section name
22-
'git-config' [--system | --global] [-z|--null] -l | --list
12+
'git-config' [<file-option>] [type] [-z|--null] name [value [value_regex]]
13+
'git-config' [<file-option>] [type] --add name value
14+
'git-config' [<file-option>] [type] --replace-all name [value [value_regex]]
15+
'git-config' [<file-option>] [type] [-z|--null] --get name [value_regex]
16+
'git-config' [<file-option>] [type] [-z|--null] --get-all name [value_regex]
17+
'git-config' [<file-option>] [type] [-z|--null] --get-regexp name_regex [value_regex]
18+
'git-config' [<file-option>] --unset name [value_regex]
19+
'git-config' [<file-option>] --unset-all name [value_regex]
20+
'git-config' [<file-option>] --rename-section old_name new_name
21+
'git-config' [<file-option>] --remove-section name
22+
'git-config' [<file-option>] [-z|--null] -l | --list
2323

2424
DESCRIPTION
2525
-----------
@@ -40,10 +40,16 @@ convert the value to the canonical form (simple decimal number for int,
4040
a "true" or "false" string for bool). If no type specifier is passed,
4141
no checks or transformations are performed on the value.
4242

43+
The file-option can be one of '--system', '--global' or '--file'
44+
which specify where the values will be read from or written to.
45+
The default is to assume the config file of the current repository,
46+
.git/config unless defined otherwise with GIT_DIR and GIT_CONFIG
47+
(see <<FILES>>).
48+
4349
This command will fail if:
4450

45-
. The .git/config file is invalid,
46-
. Can not write to .git/config,
51+
. The config file is invalid,
52+
. Can not write to the config file,
4753
. no section was provided,
4854
. the section or key is invalid,
4955
. you try to unset an option which does not exist,
@@ -93,6 +99,9 @@ rather than from all available files.
9399
+
94100
See also <<FILES>>.
95101

102+
-f config-file, --file config-file::
103+
Use the given config file instead of the one specified by GIT_CONFIG.
104+
96105
--remove-section::
97106
Remove the given section from the configuration file.
98107

@@ -130,8 +139,8 @@ See also <<FILES>>.
130139
FILES
131140
-----
132141

133-
There are three files where git-config will search for configuration
134-
options:
142+
If not set explicitely with '--file', there are three files where
143+
git-config will search for configuration options:
135144

136145
.git/config::
137146
Repository specific configuration file. (The filename is

‎git-daemon.html‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,17 @@ <h2>OPTIONS</h2>
327327
</p>
328328
</dd>
329329
<dt>
330+
--base-path-relaxed
331+
</dt>
332+
<dd>
333+
<p>
334+
If --base-path is enabled and repo lookup fails, with this option
335+
<tt>git-daemon</tt> will attempt to lookup without prefixing the base path.
336+
This is useful for switching to --base-path usage, while still
337+
allowing the old paths.
338+
</p>
339+
</dd>
340+
<dt>
330341
--interpolated-path=pathtemplate
331342
</dt>
332343
<dd>
@@ -624,7 +635,7 @@ <h2>GIT</h2>
624635
</div>
625636
<div id="footer">
626637
<div id="footer-text">
627-
Last updated 19-Jul-2007 02:09:37 UTC
638+
Last updated 01-Aug-2007 08:42:09 UTC
628639
</div>
629640
</div>
630641
</body>

‎git-daemon.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ OPTIONS
5454
'git://example.com/hello.git', `git-daemon` will interpret the path
5555
as '/srv/git/hello.git'.
5656

57+
--base-path-relaxed::
58+
If --base-path is enabled and repo lookup fails, with this option
59+
`git-daemon` will attempt to lookup without prefixing the base path.
60+
This is useful for switching to --base-path usage, while still
61+
allowing the old paths.
62+
5763
--interpolated-path=pathtemplate::
5864
To support virtual hosting, an interpolated path template can be
5965
used to dynamically construct alternate paths. The template

0 commit comments

Comments
 (0)