summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-03 15:27:19 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-03 15:27:19 -0700
commitdfc6b040d0f01a1fcec7acce6a3eda22b41a4933 (patch)
treeae5947ad8415e0552fada6b42fe1e13c3cf2be5a
parentf66d000b0d7d6d3c858f3aacd9a67d4809ac8011 (diff)
parentf59bebb78edb26e4f66c2754bc4d168c5d4ebb4a (diff)
downloadgit-dfc6b040d0f01a1fcec7acce6a3eda22b41a4933.tar.gz
Merge branch 'maint-1.8.2' into maint
* maint-1.8.2: git-config: update doc for --get with multiple values
-rw-r--r--Documentation/git-config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index d88a6fcb29..606f00c3b8 100644
--- 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