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

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

From
MBMatthias Baumgarten <matthias.baumgarten@aixigo.com>
Date
Jul 28, 2021, 18:18 UTC
Message-ID
<e5952eea-61f2-1beb-64a2-1a077c57f0e6@aixigo.com>
In-Reply-To
<xmqqv94u9x2l.fsf@gitster.g>
On 7/28/21 7:18 PM, Junio C Hamano wrote:
Show 18 quoted lines
> I am afraid that you are misinterpreting what I said, comparing
> apples and oranges, and drawing a wrong conclusion >
> When I said "-m" would not fly well as a short-hand for "--merge" in
> the context of "pull", I didn't mean "nobody would think 'm' stands
> for 'merge'", and I didn't mean "more people would think 'm' stands
> for 'message' more than 'merge'".  The reason why I find it
> problematic is because it can be ambiguous >
> When we step back and think about your "switch -m" and its synonym
> "checkout -m", we realize that these commands fundamentally never
> take "--message", as there is no place to record such a message
> (they do not create a commit after all), after they switch to a
> different branch while carrying the local modification forward by
> performing a (possibly conflicting) content-level merge.  That is
> why we can give their "merge" operation a short-and-sweet "m"
> without confusing our users.  So contrasting "switch" having "-m"
> that means "merge" with "pull" that can conceivably take both
> "merge" and "message" is not a comparison you can draw useful
> conclusion from.

I must confess that this comparison is indeed not a valid one. Maybe -m isn't as great as I thought it was.

-- 
aixigo AG
Karl-Friedrich-Str. 68, 52072 Aachen, Germany
phone: +49 (0)241 559709-390, fax: +49 (0)241 559709-99
email: matthias.baumgarten@aixigo.com
web: https://www.aixigo.com
District Court Aachen – HRB 8057
Board: Christian Friedrich, Tobias Haustein
Chairman of the Supervisory Board: Dr. Roland Schlager
Previous: Junio C HamanoNext: Felipe Contreras
Message 11 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.