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

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index d88a6fcb29395ac200930191518fdbceca78bbd4..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