Merge branch 'fa/maint-config-doc' into maint

By Florian Achleitner
* fa/maint-config-doc:
  Documentation/git-config: describe and clarify "--local <file>" option
maint
Junio C Hamano 2012-05-11 11:15:53 -07:00
commit 51eb3175ef
1 changed files with 9 additions and 5 deletions

View File

@ -44,11 +44,15 @@ a "true" or "false" string for bool), or '--path', which does some
path expansion (see '--path' below). If no type specifier is passed, no path expansion (see '--path' below). If no type specifier is passed, no
checks or transformations are performed on the value. checks or transformations are performed on the value.


The file-option can be one of '--system', '--global' or '--file' When reading, the values are read from the system, global and
which specify where the values will be read from or written to. repository local configuration files by default, and options
The default is to assume the config file of the current repository, '--system', '--global', '--local' and '--file <filename>' can be
.git/config unless defined otherwise with GIT_DIR and GIT_CONFIG used to tell the command to read from only that location (see <<FILES>>).
(see <<FILES>>).
When writing, the new value is written to the repository local
configuration file by default, and options '--system', '--global',
'--file <filename>' 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: This command will fail (with exit code ret) if: