Re: [PATCH] fix typo 'In such these cases'

2 messages, 2 authors, 2016-06-16 · open the first message on its own page

Re: [PATCH] fix typo 'In such these cases'

From: Junio C Hamano <hidden>
Date: 2016-06-16 02:19:08

René Nyffenegger [off-list ref] writes:
quoted
René Nyffenegger [off-list ref] writes:
quoted
From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= <redacted>
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 <<def_merge,merge>> where you have a
 	<<def_revision,revision>> and you are "merging" another
 	<<def_branch,branch>>'s changes that happen to be a descendant of what
-	you have. In such these cases, you do not make a new <<def_merge,merge>>
+	you have. In such a case, you do not make a new <<def_merge,merge>>
 	<<def_commit,commit>> 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".

Re: [PATCH] fix typo 'In such these cases'

From: René Nyffenegger <hidden>
Date: 2016-06-16 02:19:08

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 <<def_merge,merge>> where you have a
 	<<def_revision,revision>> and you are "merging" another
 	<<def_branch,branch>>'s changes that happen to be a descendant of what
-	you have. In such these cases, you do not make a new <<def_merge,merge>>
+	you have. In such a case, you do not make a new <<def_merge,merge>>
 	<<def_commit,commit>> 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.
 
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help