* [PATCH] vimdiff: clarify the sigil used for marking the buffer to save
@ 2025-03-24 20:45 D. Ben Knoble
2025-03-24 20:47 ` Eric Sunshine
0 siblings, 1 reply; 3+ messages in thread
From: D. Ben Knoble @ 2025-03-24 20:45 UTC (permalink / raw)
To: git; +Cc: D. Ben Knoble, Fernando Ramos, Junio C Hamano
The original documentation from 7b5cf8be18 (vimdiff: add tool
documentation, 2022-03-30) mistakenly described the marker as an
asterisk, which is the character "*". The code and examples have always
looked for an arobase ("@").
---
NB The (French) name arobase for "@" is gaining popularity in English writing
but is not yet universally standard. Use of a different name when picking is
fine by me.
I also did not attempt to clarify the behavior from the recent bug report [1]
because I hope it is repared rather than documented.
[1]: https://lore.kernel.org/git/CAC6paJg19ue7W0VxTnGH-1ra3Zkk+pRnj6McEC755RD54xDzCA@mail.gmail.com/
Documentation/mergetools/vimdiff.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/mergetools/vimdiff.adoc b/Documentation/mergetools/vimdiff.adoc
index befa86d692..ab915df408 100644
--- a/Documentation/mergetools/vimdiff.adoc
+++ b/Documentation/mergetools/vimdiff.adoc
@@ -86,7 +86,7 @@ command.
+
--
When `MERGED` is not present in the layout, you must "mark" one of the
-buffers with an asterisk. That will become the buffer you need to edit and
+buffers with an arobase (`@`). That will become the buffer you need to edit and
save after resolving the conflicts.
....
------------------------------------------
--
2.48.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] vimdiff: clarify the sigil used for marking the buffer to save
2025-03-24 20:45 [PATCH] vimdiff: clarify the sigil used for marking the buffer to save D. Ben Knoble
@ 2025-03-24 20:47 ` Eric Sunshine
2025-03-24 20:51 ` D. Ben Knoble
0 siblings, 1 reply; 3+ messages in thread
From: Eric Sunshine @ 2025-03-24 20:47 UTC (permalink / raw)
To: D. Ben Knoble; +Cc: git, Fernando Ramos, Junio C Hamano
On Mon, Mar 24, 2025 at 4:46 PM D. Ben Knoble
<ben.knoble+github@gmail.com> wrote:
> The original documentation from 7b5cf8be18 (vimdiff: add tool
> documentation, 2022-03-30) mistakenly described the marker as an
> asterisk, which is the character "*". The code and examples have always
> looked for an arobase ("@").
> ---
Missing sign-off.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] vimdiff: clarify the sigil used for marking the buffer to save
2025-03-24 20:47 ` Eric Sunshine
@ 2025-03-24 20:51 ` D. Ben Knoble
0 siblings, 0 replies; 3+ messages in thread
From: D. Ben Knoble @ 2025-03-24 20:51 UTC (permalink / raw)
To: Eric Sunshine; +Cc: git, Fernando Ramos, Junio C Hamano
On Mon, Mar 24, 2025 at 4:47 PM Eric Sunshine <sunshine@sunshineco.com> wrote:
>
> On Mon, Mar 24, 2025 at 4:46 PM D. Ben Knoble
> <ben.knoble+github@gmail.com> wrote:
> > The original documentation from 7b5cf8be18 (vimdiff: add tool
> > documentation, 2022-03-30) mistakenly described the marker as an
> > asterisk, which is the character "*". The code and examples have always
> > looked for an arobase ("@").
> > ---
>
> Missing sign-off.
doh, indeed.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-24 20:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-24 20:45 [PATCH] vimdiff: clarify the sigil used for marking the buffer to save D. Ben Knoble
2025-03-24 20:47 ` Eric Sunshine
2025-03-24 20:51 ` D. Ben Knoble
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox