Skip to content

Commit

Permalink
Merge branch 'mh/maint-show-ref-doc'
Browse files Browse the repository at this point in the history
* mh/maint-show-ref-doc:
  git-show-ref doc: typeset regexp in fixed width font
  git-show-ref: fix escaping in asciidoc source
  • Loading branch information
Junio C Hamano committed Jan 18, 2012
2 parents 05c65cb + 87b340b commit 8ef7933
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Documentation/git-show-ref.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 8ef7933

Please sign in to comment.