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

[PATCH] docs: fix typesetting of merge driver placeholders

From
Matthew Hughes <matthewhughes934@gmail.com>
Date
Jan 7, 2025, 21:24 UTC
Message-ID
<20250107212421.7yyvuzw4uqxnqv7t@archP14s>

Following the `CodingGuidlines`, since these placeholders are literal they should be typeset verbatim, so fix some that aren't.

Signed-off-by: Matthew Hughes <matthewhughes934@gmail.com>
---
 Documentation/gitattributes.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index e6150595af..5d12b78549 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -1166,7 +1166,7 @@ internal merge and the final merge.
 The merge driver can learn the pathname in which the merged result
 will be stored via placeholder `%P`. The conflict labels to be used
 for the common ancestor, local head and other head can be passed by
-using '%S', '%X' and '%Y` respectively.
+using `%S`, `%X` and `%Y` respectively.
 
 `conflict-marker-size`
 ^^^^^^^^^^^^^^^^^^^^^^

base-commit: 14650065b76b28d3cfa9453356ac5669b19e706e
-- 
2.47.1
Next: Junio C Hamano
Message 1 of 2 in “docs: fix typesetting of merge driver placeholders”
  1. docs: fix typesetting of merge driver placeholdersMatthew Hughes, Jan 7, 2025
  2. Junio C HamanoJan 7, 2025

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.