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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 27, 2021, 08:45 UTC
Message-ID
<xmqqwnpcdu1w.fsf@gitster.g>
In-Reply-To
<CAMMLpeTL92cDmMHsE3iuhHQrVjwLFWHxE0CwD+uDBoPGAQCrkg@mail.gmail.com>
Alex Henrie <alexhenrie24@gmail.com> writes:
> Junio, would you be willing to accept adding -m without adding --merge also?

My gut feeling is that "-m" without "--merge" in the context of "pull" is extremely unlikely to fly well.

As "git pull" is a "git fetch" followed by a "git merge" (or "git rebase"), it takes the union of common command line options from both phases, and "git merge" takes "-m 'message'" which is an option fairly familiar to users (since it comes from "git commit"). Even if we are never going to pass "-m message" from "git pull" down to underlying "git merge", squatting on short and common "-m" would be a bad idea.

Previous: Felipe ContrerasNext: Alex Henrie
Message 6 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.