From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Jul 2013 22:43:49 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.4-rc0~86
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/56df44a98759157a6d729901f0e27b749e23c0d6?hp=-c

Merge branch 'maint'

* maint:
Update draft release notes to 1.8.3.3
git-config: update doc for --get with multiple values
---

56df44a98759157a6d729901f0e27b749e23c0d6
diff --combined Documentation/git-config.txt
index 19a7be0856,606f00c3b8..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,15 -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.