Merge branch 'nk/config-local-doc'

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

diff --combined Documentation/git-config.txt
index d88a6fcb29395ac200930191518fdbceca78bbd4,9ad8fcbbb84863111473e9d80227104c3d2a94c6..19a7be085693f7f9386fd3856fa38ebeed364f99
--- 1/Documentation/git-config.txt
--- 2/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@@ -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.