[PATCH v2] Update Documentation/git-config to reflect --local option.

From

Florian Achleitner <florian.achleitner2.6.31@gmail.com>

Date

May 5, 2012, 10:03 UTC

Message-ID

<4557278.eakEfj5iWL@flomedio>

In-Reply-To

<20120504032400.GB2589@burratino>

Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
---
Updated with the formulation suggested by Junio.

 Documentation/git-config.txt |   14 +++++++++-----
 1 file 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:
 

-- 
1.7.9.5