From: Alex Henrie <alexhenrie24@gmail.com>
Date: Fri, 28 Feb 2020 21:53:12 GMT
Subject: Re: Why does `pull.rebase` default to `false`?
Message-ID: <CAMMLpeTheUdUx0GZL2pQybewkPM2d-NB1-zvV9qu=VOzrMiddg@mail.gmail.com>
In-Reply-To: <CAHd499B3HbXPo+O3u3qA-SfJ_dV=z2k5v09mVHtbjXGkAaNBvQ@mail.gmail.com>

On Fri, Feb 28, 2020 at 2:23 PM Robert Dailey <rcdailey.lists@gmail.com> wrote:
>
> So the problem statement is: Prevent newbies from doing a merge commit
> on pull. Whether its a rebase or not is beside the point. I think
> making it --ff-only would solve the issue nicely. It forces them to
> make their intention explicit: Ether do a merge pull, or a rebase
> pull. But you are forcing them to pick (and ultimately get educated).

I actually wrote a patch that prints a warning on `git pull` if the
user has not set pull.rebase in their config file or specified
--rebase, --no-rebase, or --ff-only on the command line, but I haven't
submitted it because I figured that it would start a big argument on
the mailing list. Since that argument has now already started, I
should probably just send the patch.

-Alex