Merge branch 'maint-1.8.1' into maint-1.8.2

* maint-1.8.1:
  git-config: update doc for --get with multiple values
This commit is contained in:
Junio C Hamano 2013-07-03 15:26:53 -07:00
Родитель b3b8ceb48b 62e91efafd
Коммит f59bebb78e
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -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