From: Junio C Hamano Date: Tue, 11 Sep 2012 18:09:01 +0000 (-0700) Subject: Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11 X-Git-Tag: v1.7.11.6~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f6854cad2a7a7da0a360bd520d2a86af89a36c6c?ds=inline;hp=-c Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11 * mh/maint-config-doc-proxy-command: git-config doc: unconfuse an example git-config.txt: fix example --- f6854cad2a7a7da0a360bd520d2a86af89a36c6c diff --combined Documentation/git-config.txt index d9463cb387,b24faa8a13..5d9fd47ee3 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@@ -44,15 -44,11 +44,15 @@@ a "true" or "false" string for bool), o path expansion (see '--path' below). 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 <>). +When reading, the values are read from the system, global and +repository local configuration files by default, and options +'--system', '--global', '--local' and '--file ' can be +used to tell the command to read from only that location (see <>). + +When writing, the new value is written to the repository local +configuration file by default, and options '--system', '--global', +'--file ' can be used to tell the command to write to +that location (you can say '--local' but that is the default). This command will fail (with exit code ret) if: @@@ -185,11 -181,6 +185,11 @@@ See also <> Opens an editor to modify the specified config file; either '--system', '--global', or repository (default). +--includes:: +--no-includes:: + Respect `include.*` directives in config files when looking up + values. Defaults to on. + [[FILES]] FILES ----- @@@ -198,7 -189,9 +198,7 @@@ If not set explicitly with '--file', th 'git config' will search for configuration options: $GIT_DIR/config:: - Repository specific configuration file. (The filename is - of course relative to the repository root, not the working - directory.) + Repository specific configuration file. ~/.gitconfig:: User-specific configuration file. Also called "global" @@@ -258,7 -251,7 +258,7 @@@ Given a .git/config like this ; Proxy settings [core] - gitproxy="proxy-command" for kernel.org + gitproxy=proxy-command for kernel.org gitproxy=default-proxy ; for all the rest you can set the filemode to true with @@@ -333,7 -326,7 +333,7 @@@ To actually match only values with an e To add a new proxy, without altering any of the existing ones, use ------------ - % git config core.gitproxy '"proxy-command" for example.com' + % git config --add core.gitproxy '"proxy-command" for example.com' ------------ An example to use customized color from the configuration in your