Re: [PATCH v3] pull: warn if the user didn't say whether to rebase or to merge

[Junio C Hamano <gitster@pobox.com>]

Alex Henrie <alexhenrie24@gmail.com> writes:

> On Sat, Feb 29, 2020 at 4:31 PM Elijah Newren <newren@gmail.com> wrote:
>>
> ... We also want the user to understand that they
> only have to set pull.rebase or pull.ff once, whereas a command-line
> flag applies only to the current pull.

I do not think the phrasing you used has the intended effect.

    You can replace "git config" with "git config --global" to set a
    default preference for all repositories.  You can pass --rebase,
    --no-rebase, or --ff-only on the command line to override the
    configured default per invocation.

may be more appropriate.  "You can use it, but you need to do so
every time you pull" drives readers away by placing stress on how
cumbersome it *can* become, but in practice, nobody would use the
same command line option every time anyway.

In contrast, explaining the command line option as a useful
mechanism for one-shot override, and the configuration variable as a
useful mechanism for set-and-forget convenience feature, would teach
readers in what situation use of the configuration variables and the
command line options shine the best.

Thanks.