{"thread":{"id":"42199","subject":"[PATCH] fix typo 'In such these cases'","startedAt":"2016-05-02T07:38:20Z","lastAt":"2016-05-02T19:41:13Z","messageCount":5,"participants":["René Nyffenegger","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"285150","messageId":"572703EC.20405@renenyffenegger.ch","threadId":"42199","inReplyTo":null,"subject":"[PATCH] fix typo 'In such these cases'","fromName":"René Nyffenegger","fromEmail":"mail@renenyffenegger.ch","sentAt":"2016-05-02T07:38:20Z","receivedAt":"2016-05-02T07:38:20Z","isPatch":true,"sender":{"key":"mail@renenyffenegger.ch","avatar":null},"body":"From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001\nFrom: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= \nDate: Mon, 2 May 2016 09:19:46 +0200\nSubject: [PATCH] Documentation: Fix typo 'In such these cases'\n\nFix \"In such these cases, ...\" to \"In such cases, ...\"\nin Documentation/glossary-content.txt\n\nSigned-off-by: René Nyffenegger \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 cafc284..9ceca05 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -145,7 +145,7 @@ current branch integrates with) obviously do not work, as there is no\n \tA fast-forward is a special type of <> where you have a\n \t<> and you are \"merging\" another\n \t<>'s changes that happen to be a descendant of what\n-\tyou have. In such these cases, you do not make a new <>\n+\tyou have. In these cases, you do not make a new <>\n \t<> but instead just update to his\n \trevision. This will happen frequently on a\n \t<> of a remote\n-- \n2.5.0\n"},{"id":"285188","messageId":"xmqqa8k8ti0q.fsf@gitster.mtv.corp.google.com","threadId":"42199","inReplyTo":"572703EC.20405@renenyffenegger.ch","subject":"Re: [PATCH] fix typo 'In such these cases'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-05-02T18:46:29Z","receivedAt":"2016-05-02T18:46:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"René Nyffenegger writes:\n\n> From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001\n> From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= \n> Date: Mon, 2 May 2016 09:19:46 +0200\n> Subject: [PATCH] Documentation: Fix typo 'In such these cases'\n\nFor the next time, remember that these four lines are usually not\nmeant to go to the body of the e-mail.\n\n> Fix \"In such these cases, ...\" to \"In such cases, ...\"\n> in Documentation/glossary-content.txt\n\nWow. It is an ancient typo in 9290cd58 (Added definitions for a few\nwords:, 2006-05-03) that survives to the day.\n\nThanks. Will queue.\n\n> Signed-off-by: René Nyffenegger \n> ---\n> Documentation/glossary-content.txt | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\n> index cafc284..9ceca05 100644\n> --- a/Documentation/glossary-content.txt\n> +++ b/Documentation/glossary-content.txt\n> @@ -145,7 +145,7 @@ current branch integrates with) obviously do not work, as there is no\n> \tA fast-forward is a special type of <> where you have a\n> \t<> and you are \"merging\" another\n> \t<>'s changes that happen to be a descendant of what\n> -\tyou have. In such these cases, you do not make a new <>\n> +\tyou have. In these cases, you do not make a new <>\n> \t<> but instead just update to his\n> \trevision. This will happen frequently on a\n> \t<> of a remote\n"},{"id":"285196","messageId":"5727AA7F.70504@renenyffenegger.ch","threadId":"42199","inReplyTo":"xmqqa8k8ti0q.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] fix typo 'In such these cases'","fromName":"René Nyffenegger","fromEmail":"mail@renenyffenegger.ch","sentAt":"2016-05-02T19:29:03Z","receivedAt":"2016-05-02T19:29:03Z","isPatch":true,"sender":{"key":"mail@renenyffenegger.ch","avatar":null},"body":"> René Nyffenegger writes:\n> \n>> From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001\n>> From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= \n>> Date: Mon, 2 May 2016 09:19:46 +0200\n>> Subject: [PATCH] Documentation: Fix typo 'In such these cases'\n> \n> For the next time, remember that these four lines are usually not\n> meant to go to the body of the e-mail.\n\nThanks for the reminder. This kernel and git patch-process is fairly new\nto me. I will try to do better the next time.\n\nRene\n"},{"id":"285198","messageId":"xmqqlh3ss14j.fsf@gitster.mtv.corp.google.com","threadId":"42199","inReplyTo":"5727AA7F.70504@renenyffenegger.ch","subject":"Re: [PATCH] fix typo 'In such these cases'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-05-02T19:36:44Z","receivedAt":"2016-05-02T19:36:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"René Nyffenegger writes:\n\n>> René Nyffenegger writes:\n>> \n>>> From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001\n>>> From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= \n>>> Date: Mon, 2 May 2016 09:19:46 +0200\n>>> Subject: [PATCH] Documentation: Fix typo 'In such these cases'\n>> \n>> For the next time, remember that these four lines are usually not\n>> meant to go to the body of the e-mail.\n>\n> Thanks for the reminder. This kernel and git patch-process is fairly new\n> to me. I will try to do better the next time.\n\nRe substance, I am wondering if \"In such a case\" might be better, by\nthe way. That is:\n\n \tA fast-forward is a special type of <> where you have a\n \t<> and you are \"merging\" another\n \t<>'s changes that happen to be a descendant of what\n-\tyou have. In such these cases, you do not make a new <>\n+\tyou have. In such a case, you do not make a new <>\n \t<> but instead just update to his\n \trevision. This will happen frequently on a\n\nIt is not like there are multiple variants of \"fast-forward\"\nsituations, in all of which the HEAD pointer is just moved without\ncreating a new commit. There is only one variant of \"fast-forward\".\n"},{"id":"285200","messageId":"5727AD59.3020905@renenyffenegger.ch","threadId":"42199","inReplyTo":"xmqqlh3ss14j.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] fix typo 'In such these cases'","fromName":"René Nyffenegger","fromEmail":"mail@renenyffenegger.ch","sentAt":"2016-05-02T19:41:13Z","receivedAt":"2016-05-02T19:41:13Z","isPatch":true,"sender":{"key":"mail@renenyffenegger.ch","avatar":null},"body":"> Re substance, I am wondering if \"In such a case\" might be better, by\n> the way. That is:\n> \n> \tA fast-forward is a special type of <> where you have a\n> \t<> and you are \"merging\" another\n> \t<>'s changes that happen to be a descendant of what\n> -\tyou have. In such these cases, you do not make a new <>\n> +\tyou have. In such a case, you do not make a new <>\n> \t<> but instead just update to his\n> \trevision. This will happen frequently on a\n> \n> It is not like there are multiple variants of \"fast-forward\"\n> situations, in all of which the HEAD pointer is just moved without\n> creating a new commit. There is only one variant of \"fast-forward\".\n\nThat's correct. Your suggestion makes more sense.\n \n"}]}