* [PATCH] docs: fix typesetting of merge driver placeholders
@ 2025-01-07 21:24 Matthew Hughes
2025-01-07 23:11 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Matthew Hughes @ 2025-01-07 21:24 UTC (permalink / raw)
To: git
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] docs: fix typesetting of merge driver placeholders
2025-01-07 21:24 [PATCH] docs: fix typesetting of merge driver placeholders Matthew Hughes
@ 2025-01-07 23:11 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2025-01-07 23:11 UTC (permalink / raw)
To: Matthew Hughes; +Cc: git
Matthew Hughes <matthewhughes934@gmail.com> writes:
> 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(-)
Yup, especially the %P placeholder uses the backquote/literal
mark-up already in a few lines above, this is an obviously right
thing to do.
Will queue. Thanks.
>
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-01-07 23:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-07 21:24 [PATCH] docs: fix typesetting of merge driver placeholders Matthew Hughes
2025-01-07 23:11 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).