From: "Jean-Noël Avila" <jn.avila@free•fr>
To: Junio C Hamano <gitster@pobox•com>, Johannes Sixt <j6t@kdbg•org>
Cc: "Jean-Noël Avila via GitGitGadget" <gitgitgadget@gmail•com>,
git@vger•kernel.org, "Patrick Steinhardt" <ps@pks•im>
Subject: Re: [PATCH v2 1/5] doc: git-diff: apply new documentation guidelines
Date: Wed, 13 Nov 2024 09:59:07 +0100 [thread overview]
Message-ID: <4ad6b044-5eec-4d46-a862-20f374ede527@free.fr> (raw)
In-Reply-To: <xmqqcyj03vlk.fsf@gitster.g>
Le 13/11/2024 à 00:01, Junio C Hamano a écrit :
> Johannes Sixt <j6t@kdbg•org> writes:
>
>> Does
>>
>> `-1`, `--base`::
>> `-2`, `--ours`::
>> `-3`, `--theirs`::
>>
>> not work? (I think we agree that grouping synonyms should be done and
>> not all tokens moved onto a flat line.)
>
> With the current
>
> -1 --base::
> -2 --ours::
> -3 --theirs::
> body text
>
> these are coalesced into a single header and get rendered as
>
> -1 --base, -2 --ours, -3 --theirs
> body text
>
When I first reviewed this part, I interpreted it as "there are 3 forms,
made of pairs of options used together", which did not make sense. That
is only after reading git-read-tree, that this explanation made sense.
> which reasonably shows that 1 and base belong to the same family
> that is different from 2 and ours, etc. With an explicit comma
> in between 1 and base, would we end up with
>
> -1, --base, -2, --ours, -3, --theirs
>
> which may be worse than what we have currently?
>
> Thanks.
To be consistant with description of option, I think the 3 alternatives
should be split into their own items.
next prev parent reply other threads:[~2024-11-13 8:59 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-04 20:05 [PATCH 0/5] doc: git diff reformatting Jean-Noël Avila via GitGitGadget
2024-08-04 20:05 ` [PATCH 1/5] doc: git-diff: apply new documentation guidelines Jean-Noël Avila via GitGitGadget
2024-08-05 9:11 ` Patrick Steinhardt
2024-08-05 18:51 ` Jean-Noël AVILA
2024-08-06 6:27 ` Patrick Steinhardt
2024-08-04 20:05 ` [PATCH 2/5] doc: git-diff: apply format changes to diff-options Jean-Noël Avila via GitGitGadget
2024-08-04 20:05 ` [PATCH 3/5] doc: git-diff: apply format changes to diff-format Jean-Noël Avila via GitGitGadget
2024-08-04 20:05 ` [PATCH 4/5] doc: git-diff: apply format changes to diff-generate-patch Jean-Noël Avila via GitGitGadget
2024-08-05 5:53 ` Johannes Sixt
2024-08-05 16:08 ` Junio C Hamano
2024-08-07 20:43 ` [RFC] formatting macro Jean-Noël AVILA
2024-08-12 6:35 ` Johannes Sixt
2024-08-12 15:22 ` Junio C Hamano
2024-08-13 20:42 ` Jean-Noël AVILA
2024-08-05 20:12 ` [PATCH 4/5] doc: git-diff: apply format changes to diff-generate-patch Jean-Noël AVILA
2024-08-04 20:05 ` [PATCH 5/5] doc: git-diff: apply format changes to config part Jean-Noël Avila via GitGitGadget
2024-11-11 16:53 ` [PATCH v2 0/5] doc: git diff reformatting Jean-Noël Avila via GitGitGadget
2024-11-11 16:53 ` [PATCH v2 1/5] doc: git-diff: apply new documentation guidelines Jean-Noël Avila via GitGitGadget
2024-11-12 0:48 ` Junio C Hamano
2024-11-12 8:40 ` Jean-Noël Avila
2024-11-12 9:13 ` Junio C Hamano
2024-11-12 18:28 ` Johannes Sixt
2024-11-12 23:01 ` Junio C Hamano
2024-11-13 7:31 ` Johannes Sixt
2024-11-13 8:59 ` Jean-Noël Avila [this message]
2024-11-11 16:53 ` [PATCH v2 2/5] doc: git-diff: apply format changes to diff-options Jean-Noël Avila via GitGitGadget
2024-11-12 0:52 ` Junio C Hamano
2024-11-12 9:04 ` Jean-Noël Avila
2024-11-12 9:14 ` Junio C Hamano
2024-11-11 16:53 ` [PATCH v2 3/5] doc: git-diff: apply format changes to diff-format Jean-Noël Avila via GitGitGadget
2024-11-12 18:51 ` Johannes Sixt
2024-11-12 23:03 ` Junio C Hamano
2024-11-13 7:39 ` Johannes Sixt
2024-11-13 8:10 ` Jean-Noël Avila
2024-11-11 16:53 ` [PATCH v2 4/5] doc: git-diff: apply format changes to diff-generate-patch Jean-Noël Avila via GitGitGadget
2024-11-11 16:53 ` [PATCH v2 5/5] doc: git-diff: apply format changes to config part Jean-Noël Avila via GitGitGadget
2024-11-12 18:51 ` Johannes Sixt
2024-11-13 8:12 ` Jean-Noël Avila
2024-11-16 19:36 ` [PATCH v3 0/5] doc: git diff reformatting Jean-Noël Avila via GitGitGadget
2024-11-16 19:36 ` [PATCH v3 1/5] doc: git-diff: apply new documentation guidelines Jean-Noël Avila via GitGitGadget
2024-11-17 14:04 ` Johannes Sixt
2024-11-17 16:44 ` Jean-Noël AVILA
2024-11-18 0:35 ` Junio C Hamano
2024-11-18 0:27 ` Junio C Hamano
2024-11-16 19:36 ` [PATCH v3 2/5] doc: git-diff: apply format changes to diff-options Jean-Noël Avila via GitGitGadget
2024-11-16 19:36 ` [PATCH v3 3/5] doc: git-diff: apply format changes to diff-format Jean-Noël Avila via GitGitGadget
2024-11-16 19:36 ` [PATCH v3 4/5] doc: git-diff: apply format changes to diff-generate-patch Jean-Noël Avila via GitGitGadget
2024-11-16 19:36 ` [PATCH v3 5/5] doc: git-diff: apply format changes to config part Jean-Noël Avila via GitGitGadget
2024-11-18 22:05 ` [PATCH v4 0/5] doc: git diff reformatting Jean-Noël Avila via GitGitGadget
2024-11-18 22:05 ` [PATCH v4 1/5] doc: git-diff: apply new documentation guidelines Jean-Noël Avila via GitGitGadget
2025-03-31 9:37 ` SZEDER Gábor
2025-03-31 12:55 ` [PATCH] doc: fix asciidoctor synopsis processing of triple-dots Jean-Noël Avila
2025-03-31 17:45 ` SZEDER Gábor
2025-03-31 20:30 ` Jean-Noël AVILA
2025-04-01 11:08 ` Jean-Noël Avila
2025-04-01 21:48 ` Junio C Hamano
2025-04-02 6:49 ` Jean-Noël Avila
2025-04-07 15:11 ` Junio C Hamano
2024-11-18 22:05 ` [PATCH v4 2/5] doc: git-diff: apply format changes to diff-options Jean-Noël Avila via GitGitGadget
2024-11-18 22:05 ` [PATCH v4 3/5] doc: git-diff: apply format changes to diff-format Jean-Noël Avila via GitGitGadget
2024-11-18 22:05 ` [PATCH v4 4/5] doc: git-diff: apply format changes to diff-generate-patch Jean-Noël Avila via GitGitGadget
2024-11-18 22:05 ` [PATCH v4 5/5] doc: git-diff: apply format changes to config part Jean-Noël Avila via GitGitGadget
2024-11-26 4:32 ` [PATCH v4 0/5] doc: git diff reformatting Junio C Hamano
2024-11-26 6:55 ` Johannes Sixt
2024-11-26 7:15 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4ad6b044-5eec-4d46-a862-20f374ede527@free.fr \
--to=jn.avila@free$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=gitster@pobox$(echo .)com \
--cc=j6t@kdbg$(echo .)org \
--cc=ps@pks$(echo .)im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox