Merge branch 'maint'

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 606f00c3b89479477f3bee619309de4f11bffa53..fbad05e46f1781e26955c2d5f66031500265fc0e 100644 (file)
--- 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.