{"thread":{"id":"55730","subject":"[PATCH] docs: typo in glossary content","startedAt":"2021-05-19T06:39:47Z","lastAt":"2021-05-19T12:10:35Z","messageCount":5,"participants":["Reuven Y. via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"424919","messageId":"pull.957.git.1621406381404.gitgitgadget@gmail.com","threadId":"55730","inReplyTo":null,"subject":"[PATCH] docs: typo in glossary content","fromName":"Reuven Y. via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-05-19T06:39:40Z","receivedAt":"2021-05-19T06:39:47Z","isPatch":true,"sender":{"key":"name:Reuven Y.","avatar":null},"body":"From: Reuven Y <robi@post.jce.ac.il>\n\nhis->this\nThe 't' probably just failed while typing, since we refer here to a branch not a person\n\nSigned-off-by: Reuven Yagel <robi@post.jce.ac.il>\n---\n    typo in glossary content\n    \n    his->this The 't' probably just failed while typing, since we refer here\n    to a branch not a person\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-957%2Frobi-y%2Fmaster-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-957/robi-y/master-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/957\n\n Documentation/glossary-content.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex 67c7a50b96a0..e75aed00ffe1 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -146,7 +146,7 @@ current branch integrates with) obviously do not work, as there is no\n \t<<def_revision,revision>> and you are \"merging\" another\n \t<<def_branch,branch>>'s changes that happen to be a descendant of what\n \tyou have. In such a case, you do not make a new <<def_merge,merge>>\n-\t<<def_commit,commit>> but instead just update to his\n+\t<<def_commit,commit>> but instead just update to this\n \trevision. This will happen frequently on a\n \t<<def_remote_tracking_branch,remote-tracking branch>> of a remote\n \t<<def_repository,repository>>.\n\nbase-commit: bf949ade81106fbda068c1fdb2c6fd1cb1babe7e\n-- \ngitgitgadget\n"},{"id":"424921","messageId":"xmqqtumzxjef.fsf@gitster.g","threadId":"55730","inReplyTo":"pull.957.git.1621406381404.gitgitgadget@gmail.com","subject":"Re: [PATCH] docs: typo in glossary content","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-05-19T07:38:48Z","receivedAt":"2021-05-19T07:39:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Reuven Y. via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\n> index 67c7a50b96a0..e75aed00ffe1 100644\n> --- a/Documentation/glossary-content.txt\n> +++ b/Documentation/glossary-content.txt\n> @@ -146,7 +146,7 @@ current branch integrates with) obviously do not work, as there is no\n>  \t<<def_revision,revision>> and you are \"merging\" another\n>  \t<<def_branch,branch>>'s changes that happen to be a descendant of what\n>  \tyou have. In such a case, you do not make a new <<def_merge,merge>>\n> -\t<<def_commit,commit>> but instead just update to his\n> +\t<<def_commit,commit>> but instead just update to this\n>  \trevision. This will happen frequently on a\n>  \t<<def_remote_tracking_branch,remote-tracking branch>> of a remote\n>  \t<<def_repository,repository>>.\n\nActually, \"his\" is what was intended by the original introduced at\n9290cd58 (Added definitions for a few words:, 2006-05-03).  \n\nThe \"fast-forward\" situation it describes happens when you try to\nmerge somebody else's history into your history, and if you do not\nhave anything of your own since the history of the other party\nforked from your history.  In such a situation, instead of creating\na merge commit whose parents are the tip of your history and the tip\nof the history of the other party, you just update the pointer that\npoints at the tip of your history (i.e. HEAD) to point at the commit\nat the tip of the history of the other party.\n\nOne would refer to that commit, as \"the tip of _HIS_ history\", if\none does not bother trying to be gender neutral by repeatedly saying\n\"the other party\".  So, \"his\" you touched is correct.  The\ndescription that leads to this part talks about two \"revisions\"\n(i.e. the one you have, and the other one you are merging), and\nrewriting it to \"this\" revision makes it unclear which one is meant.\n\nI do not mind neutering the expression with \"the other party\",\nespecially since that would help reduce confusion.  How about\nphrasing\n\n    In such a case, you do not make a new <<def_merge,merge>>\n    <<def_commit,commit>>, but instead just update your branch to\n    point at the same revision as the other party's.  This will\n    happen often ...\n\nperhaps?\n\nThanks.\n"},{"id":"424922","messageId":"xmqqpmxnxgq1.fsf@gitster.g","threadId":"55730","inReplyTo":"xmqqtumzxjef.fsf@gitster.g","subject":"Re: [PATCH] docs: typo in glossary content","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-05-19T08:36:38Z","receivedAt":"2021-05-19T08:36:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> \"Reuven Y. via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n>\n>> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\n>> index 67c7a50b96a0..e75aed00ffe1 100644\n>> --- a/Documentation/glossary-content.txt\n>> +++ b/Documentation/glossary-content.txt\n>> @@ -146,7 +146,7 @@ current branch integrates with) obviously do not work, as there is no\n>>  \t<<def_revision,revision>> and you are \"merging\" another\n>>  \t<<def_branch,branch>>'s changes that happen to be a descendant of what\n>>  \tyou have. In such a case, you do not make a new <<def_merge,merge>>\n>> -\t<<def_commit,commit>> but instead just update to his\n>> +\t<<def_commit,commit>> but instead just update to this\n>>  \trevision. This will happen frequently on a\n>>  \t<<def_remote_tracking_branch,remote-tracking branch>> of a remote\n>>  \t<<def_repository,repository>>.\n>\n> Actually, \"his\" is what was intended by the original introduced at\n> 9290cd58 (Added definitions for a few words:, 2006-05-03).  \n> ...\n> I do not mind neutering the expression with \"the other party\",\n> especially since that would help reduce confusion.  How about\n> phrasing\n>\n>     In such a case, you do not make a new <<def_merge,merge>>\n>     <<def_commit,commit>>, but instead just update your branch to\n>     point at the same revision as the other party's.  This will\n>     happen often ...\n>\n> perhaps?\n\nAlternatively, since we start with \"you are 'merging' another\nbranch's changes\", we could say\n\n    ... but instead just update your branch to point at the same\n    revision as the branch you are merging.  This will happen often\n    ...\n"},{"id":"424927","messageId":"pull.957.v2.git.1621416530195.gitgitgadget@gmail.com","threadId":"55730","inReplyTo":"pull.957.git.1621406381404.gitgitgadget@gmail.com","subject":"[PATCH v2] docs: improve fast-forward in glossary content","fromName":"Reuven Y. via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-05-19T09:28:49Z","receivedAt":"2021-05-19T09:28:56Z","isPatch":true,"sender":{"key":"name:Reuven Y.","avatar":null},"body":"From: Reuven Y <robi@post.jce.ac.il>\n\nThe text was somewhat confusing between the revision itself and the autour,\nimproved through a discussion with @Junio\n\nSigned-off-by: Reuven Yagel <robi@post.jce.ac.il>\n---\n    typo in glossary content\n    \n    his->this The 't' probably just failed while typing, since we refer here\n    to a branch not a person\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-957%2Frobi-y%2Fmaster-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-957/robi-y/master-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/957\n\nRange-diff vs v1:\n\n 1:  c063a7f9abfd ! 1:  66a3f7e642b6 docs: typo in glossary content\n     @@ Metadata\n      Author: Reuven Y <robi@post.jce.ac.il>\n      \n       ## Commit message ##\n     -    docs: typo in glossary content\n     +    docs: improve fast-forward in glossary content\n      \n     -    his->this\n     -    The 't' probably just failed while typing, since we refer here to a branch not a person\n     +    The text was somewhat confusing between the revision itself and the autour,\n     +    improved through a discussion with @Junio\n      \n          Signed-off-by: Reuven Yagel <robi@post.jce.ac.il>\n      \n     @@ Documentation/glossary-content.txt: current branch integrates with) obviously do\n       \t<<def_branch,branch>>'s changes that happen to be a descendant of what\n       \tyou have. In such a case, you do not make a new <<def_merge,merge>>\n      -\t<<def_commit,commit>> but instead just update to his\n     -+\t<<def_commit,commit>> but instead just update to this\n     - \trevision. This will happen frequently on a\n     +-\trevision. This will happen frequently on a\n     ++\t<<def_commit,commit>> but instead just update your branch to point at the same\n     ++    revision as the branch you are merging. This will happen frequently on a\n       \t<<def_remote_tracking_branch,remote-tracking branch>> of a remote\n       \t<<def_repository,repository>>.\n     + \n\n\n Documentation/glossary-content.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex 67c7a50b96a0..a22cef39fab0 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -146,8 +146,8 @@ current branch integrates with) obviously do not work, as there is no\n \t<<def_revision,revision>> and you are \"merging\" another\n \t<<def_branch,branch>>'s changes that happen to be a descendant of what\n \tyou have. In such a case, you do not make a new <<def_merge,merge>>\n-\t<<def_commit,commit>> but instead just update to his\n-\trevision. This will happen frequently on a\n+\t<<def_commit,commit>> but instead just update your branch to point at the same\n+    revision as the branch you are merging. This will happen frequently on a\n \t<<def_remote_tracking_branch,remote-tracking branch>> of a remote\n \t<<def_repository,repository>>.\n \n\nbase-commit: bf949ade81106fbda068c1fdb2c6fd1cb1babe7e\n-- \ngitgitgadget\n"},{"id":"424954","messageId":"xmqqlf8ayle1.fsf@gitster.g","threadId":"55730","inReplyTo":"pull.957.v2.git.1621416530195.gitgitgadget@gmail.com","subject":"Re: [PATCH v2] docs: improve fast-forward in glossary content","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-05-19T12:10:30Z","receivedAt":"2021-05-19T12:10:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Reuven Y. via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Reuven Y <robi@post.jce.ac.il>\n>\n> The text was somewhat confusing between the revision itself and the autour,\n> improved through a discussion with @Junio\n>\n\nSorry but I am not @Junio.\n\n> -\t<<def_commit,commit>> but instead just update to his\n> -\trevision. This will happen frequently on a\n> +\t<<def_commit,commit>> but instead just update your branch to point at the same\n> +    revision as the branch you are merging. This will happen frequently on a\n\nHmph, I sense a broken indentation.\n\nI'll fix it up, so no need for resending only to fix this.\n\nThanks.\n\n>  \t<<def_remote_tracking_branch,remote-tracking branch>> of a remote\n>  \t<<def_repository,repository>>.\n>  \n>\n> base-commit: bf949ade81106fbda068c1fdb2c6fd1cb1babe7e\n"}]}