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

* nk/config-local-doc:
config: Add description of --local option

diff --combined Documentation/git-config.txt
index 606f00c3b89479477f3bee619309de4f11bffa53,9ad8fcbbb84863111473e9d80227104c3d2a94c6..fbad05e46f1781e26955c2d5f66031500265fc0e
--- 1/Documentation/git-config.txt
--- 2/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@@ -82,7 -82,7 +82,7 @@@ OPTION
  --get::
        Get the value for a given key (optionally filtered by a regex
        matching the value). Returns error code 1 if the key was not
 -      found and error code 2 if multiple key values were found.
 +      found and the last value if multiple key values were found.
  
  --get-all::
        Like get, but does not fail if the number of values for the key
@@@ -114,6 -114,15 +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.
@@@ -186,7 -195,8 +195,7 @@@
        Opens an editor to modify the specified config file; either
        '--system', '--global', or repository (default).
  
 ---includes::
 ---no-includes::
 +--[no-]includes::
        Respect `include.*` directives in config files when looking up
        values. Defaults to on.