git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Why does `pull.rebase` default to `false`?

From
Alex Henrie <alexhenrie24@gmail.com>
Date
Feb 28, 2020, 21:53 UTC
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:
Show 6 quoted lines
>
> 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
Previous: Konstantin Tokarev
Message 8 of 8 in “Why does `pull.rebase` default to `false`?”
  1. Robert DaileyFeb 28, 2020
  2. Randall S. BeckerFeb 28, 2020
  3. Elijah NewrenFeb 28, 2020
  4. Junio C HamanoFeb 28, 2020
  5. Konstantin TokarevFeb 28, 2020
  6. Robert DaileyFeb 28, 2020
  7. Konstantin TokarevFeb 28, 2020
  8. Alex HenrieFeb 28, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.