Merge branch 'maint'

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

diff --combined Documentation/git-config.txt
index 19a7be085693f7f9386fd3856fa38ebeed364f99,606f00c3b89479477f3bee619309de4f11bffa53..fbad05e46f1781e26955c2d5f66031500265fc0e
--- 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
@@@ -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.