Merge branch 'maint-1.8.2' into maint

* maint-1.8.2: git-config: update doc for --get with multiple values
2013-07-03 15:27:19 -07:00 · 2013-07-03 15:27:19 -07:00 · dfc6b040d0
parent f66d000b0d f59bebb78e
commit dfc6b040d0
1 changed files with 1 additions and 1 deletions
--- 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