All of lore.kernel.org
 help / color / mirror / Atom feed
From: Elijah Newren <newren@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 08/10] merge-strategies.txt: fix simple capitalization error
Date: Tue, 3 Aug 2021 17:32:51 -0600	[thread overview]
Message-ID: <CABPp-BFuHiBGC-JnneJYCUWbX4VAT22wTFh=W2msca9A7Yovjw@mail.gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2108040058520.55@tvgsbejvaqbjf.bet>

On Tue, Aug 3, 2021 at 5:01 PM Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
>
> Hi Elijah,
>
> On Tue, 3 Aug 2021, Elijah Newren via GitGitGadget wrote:
>
> > From: Elijah Newren <newren@gmail.com>
> >
> > Signed-off-by: Elijah Newren <newren@gmail.com>
> > ---
> >  Documentation/git-rebase.txt | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> > index 7044afba362..b4429954480 100644
> > --- a/Documentation/git-rebase.txt
> > +++ b/Documentation/git-rebase.txt
> > @@ -530,7 +530,7 @@ The `--rebase-merges` mode is similar in spirit to the deprecated
> >  where commits can be reordered, inserted and dropped at will.
> >  +
> >  It is currently only possible to recreate the merge commits using the
> > -`recursive` merge strategy; Different merge strategies can be used only via
> > +`recursive` merge strategy; different merge strategies can be used only via
>
> I am not a native speaker, so I'm eager to learn what is the correct thing
> to do here. In particular since I continued in lower-case after a
> semicolon for _years_, right up until some native speaker mentioned that
> that's only correct if I continue with an incomplete sentence. If a
> complete sentence follows the semicolon, so the advice went, I should
> start the sentence with an upper-case letter.
>
> Could you help me understand the correct rules here?

First I've ever heard of it; I just presumed it was a typo.  I don't
pretend to be an expert on such topics (and although native speakers
may have an edge in knowing what "sounds natural", I tend to presume
we are less likely to know the rules).  However, some quick internet
searches suggest that different style guides differ on whether to
follow a *colon* with a capital letter[1][2][3], but everything I can
find suggests that *semicolons* should always be followed by a
lowercase letter (with exceptions for proper nouns)[2][4][5][and
others...].

[1] http://www.sussex.ac.uk/informatics/punctuation/colonandsemi/colon
[2] https://www.quora.com/Why-is-capitalization-necessary-after-a-semi-colon
[3] https://writingcenter.unc.edu/tips-and-tools/semi-colons-colons-and-dashes/
[4] https://writeanswers.royalroads.ca/faq/199268
[5] https://wordcounter.net/blog/2016/06/24/101812_capitalize-words-colon-semi-colon.html

So, after reading through the above links, I'm fairly convinced that
'different' should be lowercase here.

  reply	other threads:[~2021-08-03 23:33 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-03 15:35 [PATCH 00/10] Documentation updates: merge-strategies Elijah Newren via GitGitGadget
2021-08-03 15:35 ` [PATCH 01/10] git-rebase.txt: correct antiquated claims about --rebase-merges Elijah Newren via GitGitGadget
2021-08-03 22:53   ` Johannes Schindelin
2021-08-03 15:35 ` [PATCH 02/10] directory-rename-detection.txt: small updates due to merge-ort optimizations Elijah Newren via GitGitGadget
2021-08-04  0:06   ` Junio C Hamano
2021-08-03 15:35 ` [PATCH 03/10] Documentation: edit awkward references to `git merge-recursive` Elijah Newren via GitGitGadget
2021-08-04  0:14   ` Junio C Hamano
2021-08-04  0:19     ` Elijah Newren
2021-08-03 15:35 ` [PATCH 04/10] merge-strategies.txt: update wording for the resolve strategy Elijah Newren via GitGitGadget
2021-08-04  0:19   ` Junio C Hamano
2021-08-04  0:37     ` Elijah Newren
2021-08-04  2:01       ` Junio C Hamano
2021-08-03 15:35 ` [PATCH 05/10] merge-strategies.txt: do not imply using copy detection is desired Elijah Newren via GitGitGadget
2021-08-03 22:56   ` Johannes Schindelin
2021-08-04  0:21   ` Junio C Hamano
2021-08-03 15:35 ` [PATCH 06/10] merge-strategies.txt: avoid giving special preference to patience algorithm Elijah Newren via GitGitGadget
2021-08-03 17:00   ` Eric Sunshine
2021-08-03 15:35 ` [PATCH 07/10] merge-strategies.txt: explain why no-renames might be useful Elijah Newren via GitGitGadget
2021-08-04  0:28   ` Junio C Hamano
2021-08-04  0:44     ` Elijah Newren
2021-08-04  2:05       ` Junio C Hamano
2021-08-03 15:35 ` [PATCH 08/10] merge-strategies.txt: fix simple capitalization error Elijah Newren via GitGitGadget
2021-08-03 23:01   ` Johannes Schindelin
2021-08-03 23:32     ` Elijah Newren [this message]
2021-08-04 21:42       ` Johannes Schindelin
2021-08-03 15:35 ` [PATCH 09/10] Documentation: add coverage of the `ort` merge strategy Elijah Newren via GitGitGadget
2021-08-03 23:03   ` Johannes Schindelin
2021-08-03 23:43     ` Elijah Newren
2021-08-04  0:33   ` Junio C Hamano
2021-08-04  0:39     ` Elijah Newren
2021-08-03 15:35 ` [PATCH 10/10] Update error message and code comment Elijah Newren via GitGitGadget
2021-08-03 23:05   ` Johannes Schindelin
2021-08-03 23:49     ` Elijah Newren
2021-08-03 23:06 ` [PATCH 00/10] Documentation updates: merge-strategies Johannes Schindelin
2021-08-04  5:28 ` [PATCH v2 " Elijah Newren via GitGitGadget
2021-08-04  5:28   ` [PATCH v2 01/10] git-rebase.txt: correct antiquated claims about --rebase-merges Elijah Newren via GitGitGadget
2021-08-04  5:28   ` [PATCH v2 02/10] directory-rename-detection.txt: small updates due to merge-ort optimizations Elijah Newren via GitGitGadget
2021-08-04  5:28   ` [PATCH v2 03/10] Documentation: edit awkward references to `git merge-recursive` Elijah Newren via GitGitGadget
2021-08-04  5:28   ` [PATCH v2 04/10] merge-strategies.txt: update wording for the resolve strategy Elijah Newren via GitGitGadget
2021-08-04  5:28   ` [PATCH v2 05/10] merge-strategies.txt: do not imply using copy detection is desired Elijah Newren via GitGitGadget
2021-08-04  5:28   ` [PATCH v2 06/10] merge-strategies.txt: avoid giving special preference to patience algorithm Elijah Newren via GitGitGadget
2021-08-04  5:28   ` [PATCH v2 07/10] merge-strategies.txt: fix simple capitalization error Elijah Newren via GitGitGadget
2021-08-04  5:28   ` [PATCH v2 08/10] git-rebase.txt: correct out-of-date and misleading text about renames Elijah Newren via GitGitGadget
2021-08-04 15:50     ` Ramsay Jones
2021-08-04 17:18       ` Elijah Newren
2021-08-04  5:28   ` [PATCH v2 09/10] merge-strategies.txt: add coverage of the `ort` merge strategy Elijah Newren via GitGitGadget
2021-08-04  5:28   ` [PATCH v2 10/10] Update error message and code comment Elijah Newren via GitGitGadget
2021-08-04  6:12   ` [PATCH v2 00/10] Documentation updates: merge-strategies Junio C Hamano
2021-08-04 14:56     ` Derrick Stolee
2021-08-04 21:47   ` Johannes Schindelin
2021-08-04 23:50   ` [PATCH v3 " Elijah Newren via GitGitGadget
2021-08-04 23:50     ` [PATCH v3 01/10] git-rebase.txt: correct antiquated claims about --rebase-merges Elijah Newren via GitGitGadget
2021-08-04 23:50     ` [PATCH v3 02/10] directory-rename-detection.txt: small updates due to merge-ort optimizations Elijah Newren via GitGitGadget
2021-08-04 23:50     ` [PATCH v3 03/10] Documentation: edit awkward references to `git merge-recursive` Elijah Newren via GitGitGadget
2021-08-04 23:50     ` [PATCH v3 04/10] merge-strategies.txt: update wording for the resolve strategy Elijah Newren via GitGitGadget
2021-08-04 23:50     ` [PATCH v3 05/10] merge-strategies.txt: do not imply using copy detection is desired Elijah Newren via GitGitGadget
2021-08-04 23:50     ` [PATCH v3 06/10] merge-strategies.txt: avoid giving special preference to patience algorithm Elijah Newren via GitGitGadget
2021-08-04 23:50     ` [PATCH v3 07/10] merge-strategies.txt: fix simple capitalization error Elijah Newren via GitGitGadget
2021-08-04 23:50     ` [PATCH v3 08/10] git-rebase.txt: correct out-of-date and misleading text about renames Elijah Newren via GitGitGadget
2021-08-04 23:50     ` [PATCH v3 09/10] merge-strategies.txt: add coverage of the `ort` merge strategy Elijah Newren via GitGitGadget
2021-08-04 23:50     ` [PATCH v3 10/10] Update error message and code comment Elijah Newren via GitGitGadget

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CABPp-BFuHiBGC-JnneJYCUWbX4VAT22wTFh=W2msca9A7Yovjw@mail.gmail.com' \
    --to=newren@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.