From: Jeff King <peff@peff.net>
To: "Michael F. Schönitzer via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
"Michael F. Schönitzer" <michi4@schoenitzer.de>,
"Michael F. Schönitzer" <michael@schoenitzer.de>
Subject: Re: [PATCH] docs: fix minor glitch in illustration
Date: Wed, 22 Apr 2020 00:57:02 -0400 [thread overview]
Message-ID: <20200422045702.GE3559880@coredump.intra.peff.net> (raw)
In-Reply-To: <pull.762.git.git.1587490505031.gitgitgadget@gmail.com>
On Tue, Apr 21, 2020 at 05:35:04PM +0000, Michael F. Schönitzer via GitGitGadget wrote:
> In the example by Jon Loeliger the selector 'A^2' was duplicated. This
> might confuse readers.
>
> Signed-off-by: Michael F. Schönitzer <michael@schoenitzer.de>
> ---
> fix minor glitch in an illustration in the documentation
>
> In the example by Jon Loeliger the selector 'A^2' was duplicated. Since
> it is the only duplicate and doesn't fix in the structure I assume it is
> there by incident and since it can confuse readers this patch removes
> it.
This extra explanation could probably go into the commit message. :)
> diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
> index 97f995e5a9a..1ad95065c1f 100644
> --- a/Documentation/revisions.txt
> +++ b/Documentation/revisions.txt
> @@ -233,7 +233,7 @@ G H I J
>
> A = = A^0
> B = A^ = A^1 = A~1
> - C = A^2 = A^2
> + C = = A^2
> D = A^^ = A^1^1 = A~2
OK, so this is describing this diagram:
D E F
\ | / \
\ | / |
\|/ |
B C
\ /
\ /
A
For "B" we can express A^ as a shorthand for A^1. But for C, a second
parent, there is no such shorthand. We _must_ say A^2. But there's not
much point in saying it twice.
We could just say "C = A^2", but it makes sense to keep A^2 aligned with
the A^1 from the "B" line to make the comparison obvious.
So this patch makes sense to me.
> E = B^2 = A^^2
Curiously E goes right for B^2. It could be:
E = = B^2 = A^^2
or something if we really wanted to make a giant table where all the
possible names were grouped, but I don't think there's much point in
doing so.
-Peff
prev parent reply other threads:[~2020-04-22 4:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-21 17:35 [PATCH] docs: fix minor glitch in illustration Michael F. Schönitzer via GitGitGadget
2020-04-22 4:57 ` Jeff King [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200422045702.GE3559880@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=michael@schoenitzer.de \
--cc=michi4@schoenitzer.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).