# [PATCH] fix typo 'In such these cases' 5 messages from 2016-05-02 to 2016-05-02. Participants: René Nyffenegger, Junio C Hamano. Thread: https://gitlist.dev/t/42199 ## René Nyffenegger, 2016-05-02 07:38 Subject: [PATCH] fix typo 'In such these cases' Message-ID: <572703EC.20405@renenyffenegger.ch> URL: https://gitlist.dev/e/572703EC.20405%40renenyffenegger.ch ``` From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= Date: Mon, 2 May 2016 09:19:46 +0200 Subject: [PATCH] Documentation: Fix typo 'In such these cases' Fix "In such these cases, ..." to "In such cases, ..." in Documentation/glossary-content.txt Signed-off-by: René Nyffenegger --- Documentation/glossary-content.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index cafc284..9ceca05 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -145,7 +145,7 @@ current branch integrates with) obviously do not work, as there is no A fast-forward is a special type of <> where you have a <> and you are "merging" another <>'s changes that happen to be a descendant of what - you have. In such these cases, you do not make a new <> + you have. In these cases, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a <> of a remote -- 2.5.0 ``` ## Junio C Hamano, 2016-05-02 18:46 Subject: Re: [PATCH] fix typo 'In such these cases' Message-ID: URL: https://gitlist.dev/e/xmqqa8k8ti0q.fsf%40gitster.mtv.corp.google.com In-Reply-To: <572703EC.20405@renenyffenegger.ch> ``` René Nyffenegger writes: > From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= > Date: Mon, 2 May 2016 09:19:46 +0200 > Subject: [PATCH] Documentation: Fix typo 'In such these cases' For the next time, remember that these four lines are usually not meant to go to the body of the e-mail. > Fix "In such these cases, ..." to "In such cases, ..." > in Documentation/glossary-content.txt Wow. It is an ancient typo in 9290cd58 (Added definitions for a few words:, 2006-05-03) that survives to the day. Thanks. Will queue. > Signed-off-by: René Nyffenegger > --- > Documentation/glossary-content.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt > index cafc284..9ceca05 100644 > --- a/Documentation/glossary-content.txt > +++ b/Documentation/glossary-content.txt > @@ -145,7 +145,7 @@ current branch integrates with) obviously do not work, as there is no > A fast-forward is a special type of <> where you have a > <> and you are "merging" another > <>'s changes that happen to be a descendant of what > - you have. In such these cases, you do not make a new <> > + you have. In these cases, you do not make a new <> > <> but instead just update to his > revision. This will happen frequently on a > <> of a remote ``` ## René Nyffenegger, 2016-05-02 19:29 Subject: Re: [PATCH] fix typo 'In such these cases' Message-ID: <5727AA7F.70504@renenyffenegger.ch> URL: https://gitlist.dev/e/5727AA7F.70504%40renenyffenegger.ch In-Reply-To: ``` > René Nyffenegger writes: > >> From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001 >> From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= >> Date: Mon, 2 May 2016 09:19:46 +0200 >> Subject: [PATCH] Documentation: Fix typo 'In such these cases' > > For the next time, remember that these four lines are usually not > meant to go to the body of the e-mail. Thanks for the reminder. This kernel and git patch-process is fairly new to me. I will try to do better the next time. Rene ``` ## Junio C Hamano, 2016-05-02 19:36 Subject: Re: [PATCH] fix typo 'In such these cases' Message-ID: URL: https://gitlist.dev/e/xmqqlh3ss14j.fsf%40gitster.mtv.corp.google.com In-Reply-To: <5727AA7F.70504@renenyffenegger.ch> ``` René Nyffenegger writes: >> René Nyffenegger writes: >> >>> From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001 >>> From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= >>> Date: Mon, 2 May 2016 09:19:46 +0200 >>> Subject: [PATCH] Documentation: Fix typo 'In such these cases' >> >> For the next time, remember that these four lines are usually not >> meant to go to the body of the e-mail. > > Thanks for the reminder. This kernel and git patch-process is fairly new > to me. I will try to do better the next time. Re substance, I am wondering if "In such a case" might be better, by the way. That is: A fast-forward is a special type of <> where you have a <> and you are "merging" another <>'s changes that happen to be a descendant of what - you have. In such these cases, you do not make a new <> + you have. In such a case, you do not make a new <> <> but instead just update to his revision. This will happen frequently on a It is not like there are multiple variants of "fast-forward" situations, in all of which the HEAD pointer is just moved without creating a new commit. There is only one variant of "fast-forward". ``` ## René Nyffenegger, 2016-05-02 19:41 Subject: Re: [PATCH] fix typo 'In such these cases' Message-ID: <5727AD59.3020905@renenyffenegger.ch> URL: https://gitlist.dev/e/5727AD59.3020905%40renenyffenegger.ch In-Reply-To: ``` > Re substance, I am wondering if "In such a case" might be better, by > the way. That is: > > A fast-forward is a special type of <> where you have a > <> and you are "merging" another > <>'s changes that happen to be a descendant of what > - you have. In such these cases, you do not make a new <> > + you have. In such a case, you do not make a new <> > <> but instead just update to his > revision. This will happen frequently on a > > It is not like there are multiple variants of "fast-forward" > situations, in all of which the HEAD pointer is just moved without > creating a new commit. There is only one variant of "fast-forward". That's correct. Your suggestion makes more sense. ```