Merge branch 'jk/pull-into-dirty-unborn' into maint

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 9ae2508f3fb79b9da5fb4481a4fe2120f4a082b1..606f00c3b89479477f3bee619309de4f11bffa53 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -82,7 +82,7 @@ OPTIONS
 --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,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.