From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Jun 2013 20:48:55 +0000 (-0700)
Subject: Merge branch 'nk/config-local-doc'
X-Git-Tag: v1.8.4-rc0~131
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/869577e5fe8d4307dd39d2751cf3c5a1896d3426?ds=sidebyside;hp=-c

Merge branch 'nk/config-local-doc'

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

869577e5fe8d4307dd39d2751cf3c5a1896d3426
diff --combined Documentation/git-config.txt
index d88a6fcb29,9ad8fcbbb8..19a7be0856
--- a/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.