From: Jonathan Nieder Date: Fri, 20 Aug 2010 10:23:54 GMT Subject: [PATCH 03/17] Documentation: unbreak regex in show-ref manual Message-ID: <20100820102354.GC10407@burratino> In-Reply-To: <20100820101902.GA10356@burratino> 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 --- 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 6be8ba3..b5f0f29 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 75780d7..4696af7 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; -- 1.7.2.2.536.g42dab.dirty