From: Junio C Hamano <gitster@pobox.com>
To: Matthias Baumgarten <matthias.baumgarten@aixigo.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
Alex Henrie <alexhenrie24@gmail.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Git List Mailing <git@vger.kernel.org>
Subject: Re: [PATCH v2] pull: introduce --merge option
Date: Wed, 28 Jul 2021 10:18:10 -0700 [thread overview]
Message-ID: <xmqqv94u9x2l.fsf@gitster.g> (raw)
In-Reply-To: <9e8f1c87-cd08-e1a2-fd5d-713cb0590049@aixigo.com> (Matthias Baumgarten's message of "Wed, 28 Jul 2021 09:44:20 +0200")
Matthias Baumgarten <matthias.baumgarten@aixigo.com> writes:
> Add to Felipes list:
>
> * git switch -m
>
> and maybe git cherry-pick -m where -m does not mean "merge" itself but
> is used to determine the parent of the merge (when picking merge
> commits) to base on.
>
> Other examples of where -m has different meaning than merge:
>
> * git am -m (message-id)
> * git branch -m (move branch)
>
> I would rephrase the question as to what would I expect `git pull -m`
> to do, if I had never heard of it before. In the case of
> fast-forwarding and rebasing trying to add a merge commit message with
> -m would not even make sense. Only in the case of trying to create a
> merge commit by issuing git pull this would make sense. So if we could
> agree on that being not the most used scenario, I think -m would be a
> great short option for --merge.
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.
next prev parent reply other threads:[~2021-07-28 17:18 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 13:46 [PATCH v2] pull: introduce --merge option Felipe Contreras
2021-07-21 17:06 ` Linus Torvalds
2021-07-21 17:11 ` Junio C Hamano
2021-07-26 4:06 ` Alex Henrie
2021-07-27 2:56 ` Felipe Contreras
2021-07-27 8:45 ` Junio C Hamano
2021-07-27 15:52 ` Alex Henrie
2021-07-27 16:48 ` Felipe Contreras
2021-07-28 7:44 ` Matthias Baumgarten
2021-07-28 17:18 ` Junio C Hamano [this message]
2021-07-28 18:18 ` Matthias Baumgarten
2021-07-28 19:25 ` Felipe Contreras
2021-07-27 6:31 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqv94u9x2l.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=alexhenrie24@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=matthias.baumgarten@aixigo.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).