diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-11 18:15:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-11 18:15:53 (GMT) |
| commit | 51eb3175efc4733ce20a733b7f542b7551a7a961 (patch) | |
| tree | 157c1f8634f4cea679e906544886b581203e5c30 /Documentation/git-config.txt | |
| parent | 485cfd1a9214af705294ec0fd345450cca0ab16d (diff) | |
| parent | c598c5aa01c9a6a877986ac4a99074fc65445141 (diff) | |
| download | git-51eb3175efc4733ce20a733b7f542b7551a7a961.zip git-51eb3175efc4733ce20a733b7f542b7551a7a961.tar.gz git-51eb3175efc4733ce20a733b7f542b7551a7a961.tar.bz2 | |
Merge branch 'fa/maint-config-doc' into maint
By Florian Achleitner
* fa/maint-config-doc:
Documentation/git-config: describe and clarify "--local <file>" option
Diffstat (limited to 'Documentation/git-config.txt')
| -rw-r--r-- | Documentation/git-config.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 81b0398..3f5d216 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -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 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>>). +When reading, the values are read from the system, global and +repository local configuration files by default, and options +'--system', '--global', '--local' and '--file <filename>' can be +used to tell the command to read from only that location (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: |