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

Re: [PATCH v2] pull: introduce --merge option

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Jul 21, 2021, 17:06 UTC
Message-ID
<CAHk-=whf-9kNV3y5G-VVA2K5EZCnvv94paAEj6p=i2R4RM2emQ@mail.gmail.com>
In-Reply-To
<20210721134650.1866387-1-felipe.contreras@gmail.com>

On Wed, Jul 21, 2021 at 6:47 AM Felipe Contreras <felipe.contreras@gmail.com> wrote:

>
> Users need to specify if they want to either --merge or --rebase, but
> unfortunately the former is missing.

Ack. I think it's just historical, because long long ago it used to be that 'git pull' always merged unless told otherwise with --rebase.

               Linus
Previous: Felipe ContrerasNext: Junio C Hamano
Message 2 of 13 in “pull: introduce --merge option”
  1. pull: introduce --merge optionFelipe Contreras, Jul 21, 2021
  2. Linus TorvaldsJul 21, 2021
  3. Junio C HamanoJul 21, 2021
  4. Alex HenrieJul 26, 2021
  5. Felipe ContrerasJul 27, 2021
  6. Junio C HamanoJul 27, 2021
  7. Alex HenrieJul 27, 2021
  8. Felipe ContrerasJul 27, 2021
  9. Matthias BaumgartenJul 28, 2021
  10. Junio C HamanoJul 28, 2021
  11. Matthias BaumgartenJul 28, 2021
  12. Felipe ContrerasJul 28, 2021
  13. Felipe ContrerasJul 27, 2021

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.