diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-18 15:16:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-18 15:16:23 -0800 |
| commit | 8ef7933880e6134f51d7bb5d7566b31ca93ee8c7 (patch) | |
| tree | df106869db42c55673aaca3d98c1d3f8ac6aae99 | |
| parent | 05c65cb1161f232c65b186d6d6eb3bce9c6a0924 (diff) | |
| parent | 87b340b9677c898136b84015d8119972bb7d260b (diff) | |
| download | git-8ef7933880e6134f51d7bb5d7566b31ca93ee8c7.tar.gz | |
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
| -rw-r--r-- | Documentation/git-show-ref.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt index 3c45895299..fcee0008a9 100644 --- a/Documentation/git-show-ref.txt +++ b/Documentation/git-show-ref.txt @@ -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; |