From f1005987e2c5295f57b19504baa86f1e8fc4a8c2 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 20 Aug 2010 05:23:54 -0500 Subject: [PATCH] Documentation: unbreak regex in show-ref manual I am not sure why, but the regular expression "(?:\^\{\})" gets rendered by asciidoc as "(?:\{})". The intent seems to be a regex matching the literal string "^{}", so this rewrites the markup to produce "(?:\^{})" as output. Cc: Julian Phillips Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/asciidoc.conf | 1 + Documentation/git-show-ref.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 6be8ba325..b5f0f29d1 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -16,6 +16,7 @@ plus=+ caret=^ startsb=[ endsb=] +backslash=\ tilde=~ apostrophe=' backtick=` diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt index 75780d7d6..4696af743 100644 --- a/Documentation/git-show-ref.txt +++ b/Documentation/git-show-ref.txt @@ -73,8 +73,8 @@ OPTIONS --exclude-existing[=]:: Make 'git show-ref' act as a filter that reads refs from stdin of the - form "^(?:\s)?(?:\^\{\})?$" and performs the - following actions on each: + form "^(?:\s)?(?:{backslash}{caret}\{\})?$" + and performs the following actions on each: (1) strip "^{}" 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; -- 2.11.0