mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 05c65cb116 87b340b967
commit 8ef7933880
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-show-ref.txt
View File

@ -44,7 +44,7 @@ OPTIONS
-d:: -d::
--dereference:: --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. appended.
-s:: -s::
@ -73,9 +73,9 @@ OPTIONS
--exclude-existing[=<pattern>]:: --exclude-existing[=<pattern>]::
Make 'git show-ref' act as a filter that reads refs from stdin of the 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: 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; (2) ignore if pattern is provided and does not head-match refname;
(3) warn if refname is not a well-formed refname and skip; (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; (4) ignore if refname is a ref that exists in the local repository;