Alex Henrie wrote:

On Wed, Jun 23, 2021 at 11:55 PM Felipe Contreras
[off-list ref] wrote:

quoted

Alex Henrie wrote:

quoted

On Wed, Jun 23, 2021 at 12:19 PM Felipe Contreras
[off-list ref] wrote:

quoted

Similarly, until "git pull" does something sensible by default (which
isn't the case now), these debates will continue, and there's value in
them.

At this point, I'm inclined to push for s/advise/die/ in pull.c in the
next release, without a transitional period, just to end the argument
over how to best explain the current awkward situation. (I'm sure
there will be more arguments after that, but hopefully they won't be
as tiresome.)

Give it a try. You will inevitably stumble upon all the problems I
already fixed.

Patch sent.

I sent a bunch of comments to the approach you sent. I think that's not
all the issues, but it's been a while since the last time I took a good
look at this, I feel I'm still missing one issue.

quoted

In the meantime what's the problem with v2?

I think that setting pull.rebase on a per-repository basis (instead of
globally or per-invocation) makes for the easiest workflow in the
majority of cases, so I would prefer to continue to recommend that to
users primarily, but I don't have a strong opinion.

OK. What happens if you don't have the configuration in the particular
repository you are using?

-- 
Felipe Contreras