Re: [PATCH 03/10] Documentation: edit awkward references to `git merge-recursive`

From: Elijah Newren <newren@gmail.com>
Date: Aug 4, 2021, 00:19 UTC
Message-ID: <CABPp-BFYxCZtvvX9-5MiDO-CUd2suY77JdrCiLkmkbeiVk08uQ@mail.gmail.com>
In-Reply-To: <xmqqr1farrqg.fsf@gitster.g>

On Tue, Aug 3, 2021 at 6:14 PM Junio C Hamano <gitster@pobox.com> wrote:

Show 19 quoted lines

>
> "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > @@ -355,8 +355,8 @@ See also INCOMPATIBLE OPTIONS below.
> >  -s <strategy>::
> >  --strategy=<strategy>::
> >       Use the given merge strategy.
> > -     If there is no `-s` option 'git merge-recursive' is used
> > -     instead.  This implies --merge.
> > +     If there is no `-s` option the `recursive` strategy is the
> > +     default. This implies --merge.
>
> We can depart from the original even more to make it shorter and
> more readable, I think.
>
>     Use the given merge strategy, instead of the default
>     `recursive`.  This implies `--merge`.
>
> But the above is readable enough already, so I'll queue it as-is.

I'm making multiple tweaks already for Eric and Dscho, so I'll include this in the re-roll.