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

Re: fc/pull-merge-rebase, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)

From
Theodore Y. Ts'o <tytso@mit.edu>
Date
Dec 10, 2020, 15:27 UTC
Message-ID
<20201210152715.GQ52960@mit.edu>
In-Reply-To
<xmqqk0tq1xf3.fsf@gitster.c.googlers.com>
On Wed, Dec 09, 2020 at 01:28:48PM -0800, Junio C Hamano wrote:
> 
> A spot check: do you have pull.rebase set to anything in your
> config?

FWIW, I haven't set pull.rebase to anything, but what I have done is to simply added --ff-only or --rebase to my "git pull" commands. I type fast, though, so it's not that a big deal, and I like the fact that the warning is making me explicitly express what it is that I want to have happen.

It's also true that very often, I end up running "git fetch", then look at what I got pulled down, and only then run either "git merge" or "git merge --ff-only" or "git rebase" explicitly.

Cheers,
					- Ted
Previous: Felipe ContrerasNext: Junio C Hamano
Message 15 of 30 in “What's cooking in git.git (Dec 2020, #01; Tue, 8)”
  1. Junio C HamanoDec 9, 2020
  2. Taylor BlauDec 9, 2020
  3. Jonathan TanDec 10, 2020
  4. Elijah NewrenDec 9, 2020
  5. Junio C HamanoDec 9, 2020
  6. Taylor BlauDec 9, 2020
  7. Junio C HamanoDec 10, 2020
  8. Jonathan TanDec 10, 2020
  9. fc/pull-merge-rebase, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)Johannes Schindelin, Dec 9, 2020
  10. Junio C HamanoDec 9, 2020
  11. Felipe ContrerasDec 10, 2020
  12. Johannes SchindelinDec 10, 2020
  13. Johannes SchindelinDec 10, 2020
  14. Felipe ContrerasDec 10, 2020
  15. Theodore Y. Ts'oDec 10, 2020
  16. Junio C HamanoDec 10, 2020
  17. Felipe ContrerasDec 11, 2020
  18. Junio C HamanoDec 11, 2020
  19. Theodore Y. Ts'oDec 11, 2020
  20. Felipe ContrerasDec 12, 2020
  21. Felipe ContrerasDec 11, 2020
  22. Felipe ContrerasDec 10, 2020
  23. Junio C HamanoDec 11, 2020
  24. js/init-defaultbranch-advice, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)Johannes Schindelin, Dec 9, 2020
  25. Junio C HamanoDec 9, 2020
  26. Johannes SchindelinDec 10, 2020
  27. Junio C HamanoDec 10, 2020
  28. Felipe ContrerasDec 11, 2020
  29. bc/rev-parse-path-format, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)Johannes Schindelin, Dec 10, 2020
  30. Junio C HamanoDec 10, 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.