Merge branch 'nk/config-local-doc' into maint

* nk/config-local-doc: config: Add description of --local option
git-mirror · Jul 22, 2013 · b6538a0 · b6538a0
2 parents eac00c5 + 560d4b8
commit b6538a0
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
@@ -114,6 +114,15 @@ rather than from all available files.
 +
 See also <<FILES>>.
 
+--local::
+	For writing options: write to the repository .git/config file.
+	This is	the default behavior.
++
+For reading options: read only from the repository .git/config rather than
+from all available files.
++
+See also <<FILES>>.
+
 -f config-file::
 --file config-file::
 	Use the given config file instead of the one specified by GIT_CONFIG.