aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorFlorian Achleitner <florian.achleitner2.6.31@gmail.com>2012-05-05 12:03:52 +0200
committerJunio C Hamano <gitster@pobox.com>2012-05-07 15:27:56 -0700
commitc598c5aa01c9a6a877986ac4a99074fc65445141 (patch)
tree4059911cad8a9b795c71cd645217fbcaf3c3875a /Documentation
parentf174a2583c9f42315b60205890fa67a79a1f1669 (diff)
downloadgit-c598c5aa01c9a6a877986ac4a99074fc65445141.tar.gz
git-c598c5aa01c9a6a877986ac4a99074fc65445141.tar.xz
Documentation/git-config: describe and clarify "--local <file>" option
Describe config file selection in git-config. While the usage message of git-config shows --local, the documentation page did not contain anything about that. Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-config.txt14
1 files changed, 9 insertions, 5 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index e7ecf5d80..800a5cd79 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: