Merge branch 'maint-1.8.2' into maint

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

diff --combined Documentation/git-config.txt
index d88a6fcb29395ac200930191518fdbceca78bbd4,772ae2ac3f06b6553ec6358a2453293537e5265c..606f00c3b89479477f3bee619309de4f11bffa53
--- 1/Documentation/git-config.txt
--- 2/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.