Skip to content

Commit 8ef7933

Browse files
committed
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
2 parents 05c65cb + 87b340b commit 8ef7933

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Documentation/git-show-ref.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ OPTIONS
4444
-d::
4545
--dereference::
4646

47-
Dereference tags into object IDs as well. They will be shown with "^{}"
47+
Dereference tags into object IDs as well. They will be shown with "{caret}{}"
4848
appended.
4949

5050
-s::
@@ -73,9 +73,9 @@ OPTIONS
7373
--exclude-existing[=<pattern>]::
7474

7575
Make 'git show-ref' act as a filter that reads refs from stdin of the
76-
form "^(?:<anything>\s)?<refname>(?:{backslash}{caret}\{\})?$"
76+
form "`{caret}(?:<anything>\s)?<refname>(?:{backslash}{caret}{})?$`"
7777
and performs the following actions on each:
78-
(1) strip "^{}" at the end of line if any;
78+
(1) strip "{caret}{}" at the end of line if any;
7979
(2) ignore if pattern is provided and does not head-match refname;
8080
(3) warn if refname is not a well-formed refname and skip;
8181
(4) ignore if refname is a ref that exists in the local repository;

0 commit comments

Comments
 (0)