git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 1/2] doc: revisions: fix missing escape

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
May 4, 2023, 16:34 UTC
Message-ID
<20230504163421.100400-2-felipe.contreras@gmail.com>
In-Reply-To
<20230504163421.100400-1-felipe.contreras@gmail.com>

In AsciiDoc `{foo}` is an attribute, if one doesn't want the attribute replaced the left curly brace symbol has to be escaped.

For some reason asciidoc.py skips the whole line otherwise:
  --- a/gitrevisions.7
  +++ b/gitrevisions.7
  @@ -112,8 +112,10 @@ SPECIFYING REVISIONS
          [<branchname>]@{upstream}, e.g. master@{upstream}, @{u}
              A branch B may be set up to build on top of a branch X (configured
  -           with branch.<name>.merge) at a remote R (configured with the branch
  -           X taken from remote R, typically found at refs/remotes/R/X.
  +           with branch.<name>.merge) at a remote R (configured with
  +           branch.<name>.remote). B@{u} refers to the remote-tracking branch
  +           for the branch X taken from remote R, typically found at
  +           refs/remotes/R/X.
          [<branchname>]@{push}, e.g. master@{push}, @{push}
              The suffix @{push} reports the branch "where we would push to" if
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 Documentation/revisions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 9aa58052bc..af764de153 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -99,7 +99,7 @@ some output processing may assume ref names in UTF-8.
 '[<branchname>]@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}'::
   A branch B may be set up to build on top of a branch X (configured with
   `branch.<name>.merge`) at a remote R (configured with
-  `branch.<name>.remote`). B@{u} refers to the remote-tracking branch for
+  `branch.<name>.remote`). B@\{u} refers to the remote-tracking branch for
   the branch X taken from remote R, typically found at `refs/remotes/R/X`.
 
 '[<branchname>]@\{push\}', e.g. 'master@\{push\}', '@\{push\}'::
-- 
2.40.0+fc1
Previous: Felipe ContrerasNext: Felipe Contreras
Message 2 of 3 in “doc: revisions: fixes and cleanups”
  1. 0/2 doc: revisions: fixes and cleanupsFelipe Contreras, May 4, 2023
  2. 1/2 doc: revisions: fix missing escapeFelipe Contreras, May 4, 2023
  3. 2/2 doc: revisions: add a bunch of missing quotesFelipe Contreras, May 4, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.