From: Junio C Hamano <gitster@pobox.com>
To: "Jean-Noël Avila via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Johannes Sixt" <j6t@kdbg.org>,
"Patrick Steinhardt" <ps@pks.im>,
"Jean-Noël Avila" <jn.avila@free.fr>
Subject: Re: [PATCH v2 1/5] doc: git-diff: apply new documentation guidelines
Date: Tue, 12 Nov 2024 09:48:01 +0900 [thread overview]
Message-ID: <xmqqo72l8egu.fsf@gitster.g> (raw)
In-Reply-To: <c104bd50b646646e980905a9294209f381b9e61c.1731343985.git.gitgitgadget@gmail.com> ("Jean-Noël Avila via GitGitGadget"'s message of "Mon, 11 Nov 2024 16:53:01 +0000")
"Jean-Noël Avila via GitGitGadget" <gitgitgadget@gmail.com> writes:
> +[synopsis]
> +git diff [<options>] [<commit>] [--] [<path>...]
> +git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]
> +git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]
> +git diff [<options>] <commit>...<commit> [--] [<path>...]
> +git diff [<options>] <blob> <blob>
> +git diff [<options>] --no-index [--] <path> <path>
Again, not having to worry about `mark-up` _<rules>_ in SYNOPSIS section
is very nice.
You may already have explained the rules elsewhere, but please
help me refresh my memory with some explanation.
> -'git diff' [<options>] [--] [<path>...]::
> +`git diff [<options>] [--] [<path>...]`::
Here, we just say `everything in literal, including placeholders`,
which is very pleasant for us writers.
> --1 --base::
> --2 --ours::
> --3 --theirs::
> +`-1` `--base`::
> +`-2` `--ours`::
> +`-3` `--theirs`::
Why aren't these `-1 --base` and instead mark up individual tokens?
> -<path>...::
> - The <paths> parameters, when given, are used to limit
> +_<path>_...::
This has to do the _italics_ for placeholders, unlike the full
command line examples we saw earlier?
Where does this difference come from?
Thanks.
next prev parent reply other threads:[~2024-11-12 0:48 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 [this message]
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
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=xmqqo72l8egu.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=j6t@kdbg.org \
--cc=jn.avila@free.fr \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.