From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jul 2013 05:51:39 +0000 (-0700)
Subject: Merge branch 'nk/config-local-doc' into maint
X-Git-Tag: v1.8.3.4~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b6538a0b4eee113d207961bacc1abb6ac5b2e661?ds=inline;hp=-c

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

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

b6538a0b4eee113d207961bacc1abb6ac5b2e661
diff --combined Documentation/git-config.txt
index 606f00c3b8,9ad8fcbbb8..fbad05e46f
--- a/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.