Merge branch 'mh/maint-show-ref-doc'

* mh/maint-show-ref-doc:
  git-show-ref doc: typeset regexp in fixed width font
  git-show-ref: fix escaping in asciidoc source
This commit is contained in:
Junio C Hamano 2012-01-18 15:16:23 -08:00
commit 8ef7933880

View File

@ -44,7 +44,7 @@ OPTIONS
-d::
--dereference::
Dereference tags into object IDs as well. They will be shown with "^{}"
Dereference tags into object IDs as well. They will be shown with "{caret}{}"
appended.
-s::
@ -73,9 +73,9 @@ OPTIONS
--exclude-existing[=<pattern>]::
Make 'git show-ref' act as a filter that reads refs from stdin of the
form "^(?:<anything>\s)?<refname>(?:{backslash}{caret}\{\})?$"
form "`{caret}(?:<anything>\s)?<refname>(?:{backslash}{caret}{})?$`"
and performs the following actions on each:
(1) strip "^{}" at the end of line if any;
(1) strip "{caret}{}" at the end of line if any;
(2) ignore if pattern is provided and does not head-match refname;
(3) warn if refname is not a well-formed refname and skip;
(4) ignore if refname is a ref that exists in the local repository;