From 0ddc94d36eb0eafd58ec0e269e48d13d959558a7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 1 Aug 2007 08:42:39 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc3-107-g73a7 --- git-config.html | 45 +++++++++++++++++++++++++++++---------------- git-config.txt | 39 ++++++++++++++++++++++++--------------- git-daemon.html | 13 ++++++++++++- git-daemon.txt | 6 ++++++ 4 files changed, 71 insertions(+), 32 deletions(-) diff --git a/git-config.html b/git-config.html index 49295b7de..61fa4723c 100644 --- a/git-config.html +++ b/git-config.html @@ -273,17 +273,17 @@ git-config(1) Manual Page

SYNOPSIS

-
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

@@ -301,16 +301,21 @@ prepend a single exclamation mark in front (see also [EXAMPL 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:

  1. -The .git/config file is invalid, +The config file is invalid,

  2. -Can not write to .git/config, +Can not write to the config file,

  3. @@ -414,6 +419,14 @@ 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
    @@ -489,8 +502,8 @@ rather than from all available 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::
@@ -1872,7 +1885,7 @@ transfer.unpackLimit
diff --git a/git-config.txt b/git-config.txt index 5f66a7fcd..8451cccf8 100644 --- 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' [] [type] [-z|--null] name [value [value_regex]] +'git-config' [] [type] --add name value +'git-config' [] [type] --replace-all name [value [value_regex]] +'git-config' [] [type] [-z|--null] --get name [value_regex] +'git-config' [] [type] [-z|--null] --get-all name [value_regex] +'git-config' [] [type] [-z|--null] --get-regexp name_regex [value_regex] +'git-config' [] --unset name [value_regex] +'git-config' [] --unset-all name [value_regex] +'git-config' [] --rename-section old_name new_name +'git-config' [] --remove-section name +'git-config' [] [-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 <>). + 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 <>. +-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 ----- -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 606c88b3b..5e2845b1b 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -327,6 +327,17 @@ git repositories.

+--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
@@ -624,7 +635,7 @@ they correspond to these IP addresses.

diff --git a/git-daemon.txt b/git-daemon.txt index 4b30b18b4..f902161c0 100644 --- 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 -- 2.26.2