summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-03 22:26:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-03 22:26:53 (GMT)
commitf59bebb78edb26e4f66c2754bc4d168c5d4ebb4a (patch)
treeaec9130d13af45eaa2f02a7f4f38328fe83af3d2
parentb3b8ceb48b7d75631a8638f1dc6ccdf7f1b53888 (diff)
parent62e91efafd2030b7dc33ac6450b4e9a316e6ecc6 (diff)
downloadgit-f59bebb78edb26e4f66c2754bc4d168c5d4ebb4a.zip
git-f59bebb78edb26e4f66c2754bc4d168c5d4ebb4a.tar.gz
git-f59bebb78edb26e4f66c2754bc4d168c5d4ebb4a.tar.bz2
Merge branch 'maint-1.8.1' into maint-1.8.2
* maint-1.8.1: 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 9ae2508..772ae2a 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