{"thread":{"id":"53275","subject":"[PATCH] docs: fix minor glitch in illustration","startedAt":"2020-04-21T17:35:11Z","lastAt":"2020-04-22T04:57:05Z","messageCount":2,"participants":["Michael F. Schönitzer via GitGitGadget","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"395837","messageId":"pull.762.git.git.1587490505031.gitgitgadget@gmail.com","threadId":"53275","inReplyTo":null,"subject":"[PATCH] docs: fix minor glitch in illustration","fromName":"Michael F. Schönitzer via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-04-21T17:35:04Z","receivedAt":"2020-04-21T17:35:11Z","isPatch":true,"sender":{"key":"name:Michael F. Schönitzer","avatar":null},"body":"From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= \n\nIn the example by Jon Loeliger the selector 'A^2' was duplicated. This\nmight confuse readers.\n\nSigned-off-by: Michael F. Schönitzer \n---\n fix minor glitch in an illustration in the documentation\n \n In the example by Jon Loeliger the selector 'A^2' was duplicated. Since\n it is the only duplicate and doesn't fix in the structure I assume it is\n there by incident and since it can confuse readers this patch removes\n it.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-762%2FNudin%2FNudin-patch-docs-1-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-762/Nudin/Nudin-patch-docs-1-v1\nPull-Request: https://github.com/git/git/pull/762\n\n Documentation/revisions.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex 97f995e5a9a..1ad95065c1f 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -233,7 +233,7 @@ G H I J\n \n A = = A^0\n B = A^ = A^1 = A~1\n- C = A^2 = A^2\n+ C = = A^2\n D = A^^ = A^1^1 = A~2\n E = B^2 = A^^2\n F = B^3 = A^^3\n\nbase-commit: 9fadedd637b312089337d73c3ed8447e9f0aa775\n-- \ngitgitgadget\n"},{"id":"395884","messageId":"20200422045702.GE3559880@coredump.intra.peff.net","threadId":"53275","inReplyTo":"pull.762.git.git.1587490505031.gitgitgadget@gmail.com","subject":"Re: [PATCH] docs: fix minor glitch in illustration","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2020-04-22T04:57:02Z","receivedAt":"2020-04-22T04:57:05Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Apr 21, 2020 at 05:35:04PM +0000, Michael F. Schönitzer via GitGitGadget wrote:\n\n> In the example by Jon Loeliger the selector 'A^2' was duplicated. This\n> might confuse readers.\n> \n> Signed-off-by: Michael F. Schönitzer \n> ---\n> fix minor glitch in an illustration in the documentation\n> \n> In the example by Jon Loeliger the selector 'A^2' was duplicated. Since\n> it is the only duplicate and doesn't fix in the structure I assume it is\n> there by incident and since it can confuse readers this patch removes\n> it.\n\nThis extra explanation could probably go into the commit message. :)\n\n> diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\n> index 97f995e5a9a..1ad95065c1f 100644\n> --- a/Documentation/revisions.txt\n> +++ b/Documentation/revisions.txt\n> @@ -233,7 +233,7 @@ G H I J\n> \n> A = = A^0\n> B = A^ = A^1 = A~1\n> - C = A^2 = A^2\n> + C = = A^2\n> D = A^^ = A^1^1 = A~2\n\nOK, so this is describing this diagram:\n\n D E F\n \\ | / \\\n \\ | / |\n \\|/ |\n B C\n \\ /\n \\ /\n A\n\nFor \"B\" we can express A^ as a shorthand for A^1. But for C, a second\nparent, there is no such shorthand. We _must_ say A^2. But there's not\nmuch point in saying it twice.\n\nWe could just say \"C = A^2\", but it makes sense to keep A^2 aligned with\nthe A^1 from the \"B\" line to make the comparison obvious.\n\nSo this patch makes sense to me.\n\n> E = B^2 = A^^2\n\nCuriously E goes right for B^2. It could be:\n\n E = = B^2 = A^^2\n\nor something if we really wanted to make a giant table where all the\npossible names were grouped, but I don't think there's much point in\ndoing so.\n\n-Peff\n"}]}