From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Jul 2013 22:27:19 +0000 (-0700)
Subject: Merge branch 'maint-1.8.2' into maint
X-Git-Tag: v1.8.3.3~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dfc6b040d0f01a1fcec7acce6a3eda22b41a4933?hp=-c

Merge branch 'maint-1.8.2' into maint

* maint-1.8.2:
git-config: update doc for --get with multiple values
---

dfc6b040d0f01a1fcec7acce6a3eda22b41a4933
diff --combined Documentation/git-config.txt
index d88a6fcb29,772ae2ac3f..606f00c3b8
--- 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
@@@ -186,7 -186,8 +186,7 @@@ See also <<FILES>>
  	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.