{"thread":{"id":"62764","subject":"[PATCH] docs: fix typesetting of merge driver placeholders","startedAt":"2025-01-07T21:24:24Z","lastAt":"2025-01-07T23:11:04Z","messageCount":2,"participants":["Matthew Hughes","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"510124","messageId":"20250107212421.7yyvuzw4uqxnqv7t@archP14s","threadId":"62764","inReplyTo":null,"subject":"[PATCH] docs: fix typesetting of merge driver placeholders","fromName":"Matthew Hughes","fromEmail":"matthewhughes934@gmail.com","sentAt":"2025-01-07T21:24:21Z","receivedAt":"2025-01-07T21:24:24Z","isPatch":true,"sender":{"key":"matthewhughes934@gmail.com","avatar":"https://avatars.githubusercontent.com/u/34972397?v=4"},"body":"Following the `CodingGuidlines`, since these placeholders are literal\nthey should be typeset verbatim, so fix some that aren't.\n\nSigned-off-by: Matthew Hughes <matthewhughes934@gmail.com>\n---\n Documentation/gitattributes.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex e6150595af..5d12b78549 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -1166,7 +1166,7 @@ internal merge and the final merge.\n The merge driver can learn the pathname in which the merged result\n will be stored via placeholder `%P`. The conflict labels to be used\n for the common ancestor, local head and other head can be passed by\n-using '%S', '%X' and '%Y` respectively.\n+using `%S`, `%X` and `%Y` respectively.\n \n `conflict-marker-size`\n ^^^^^^^^^^^^^^^^^^^^^^\n\nbase-commit: 14650065b76b28d3cfa9453356ac5669b19e706e\n-- \n2.47.1\n\n"},{"id":"510130","messageId":"xmqqed1eqkxm.fsf@gitster.g","threadId":"62764","inReplyTo":"20250107212421.7yyvuzw4uqxnqv7t@archP14s","subject":"Re: [PATCH] docs: fix typesetting of merge driver placeholders","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-01-07T23:11:01Z","receivedAt":"2025-01-07T23:11:04Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthew Hughes <matthewhughes934@gmail.com> writes:\n\n> Following the `CodingGuidlines`, since these placeholders are literal\n> they should be typeset verbatim, so fix some that aren't.\n>\n> Signed-off-by: Matthew Hughes <matthewhughes934@gmail.com>\n> ---\n>  Documentation/gitattributes.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n\nYup, especially the %P placeholder uses the backquote/literal\nmark-up already in a few lines above, this is an obviously right\nthing to do.\n\nWill queue.  Thanks.\n\n>\n> diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\n> index e6150595af..5d12b78549 100644\n> --- a/Documentation/gitattributes.txt\n> +++ b/Documentation/gitattributes.txt\n> @@ -1166,7 +1166,7 @@ internal merge and the final merge.\n>  The merge driver can learn the pathname in which the merged result\n>  will be stored via placeholder `%P`. The conflict labels to be used\n>  for the common ancestor, local head and other head can be passed by\n> -using '%S', '%X' and '%Y` respectively.\n> +using `%S`, `%X` and `%Y` respectively.\n>  \n>  `conflict-marker-size`\n>  ^^^^^^^^^^^^^^^^^^^^^^\n>\n> base-commit: 14650065b76b28d3cfa9453356ac5669b19e706e\n"}]}