From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 03 Aug 2021 23:01:39 GMT
Subject: Re: [PATCH 08/10] merge-strategies.txt: fix simple capitalization error
Message-ID: <nycvar.QRO.7.76.6.2108040058520.55@tvgsbejvaqbjf.bet>
In-Reply-To: <010702d08417f86da033ae8a6093ec4b9ce6e19a.1628004920.git.gitgitgadget@gmail.com>

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?

Thanks,
Dscho

>  explicit `exec git merge -s <strategy> [...]` commands.
>  +
>  See also REBASING MERGES and INCOMPATIBLE OPTIONS below.
> --
> gitgitgadget
>
>