From: Matthias Baumgarten <matthias.baumgarten@aixigo.com>
To: Felipe Contreras <felipe.contreras@gmail.com>,
Alex Henrie <alexhenrie24@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Cc: 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 09:44:20 +0200 [thread overview]
Message-ID: <9e8f1c87-cd08-e1a2-fd5d-713cb0590049@aixigo.com> (raw)
In-Reply-To: <610038c0e1056_8fd52084a@natae.notmuch>
On 7/27/21 6:48 PM, Felipe Contreras wrote:
> Alex Henrie wrote:
>> On Tue, Jul 27, 2021 at 2:45 AM Junio C Hamano <gitster@pobox.com> wrote:
>>>
>>> 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.
>>
>> Thanks for the explanation. I forgot that "-m" usually means
>> "message". That does seem like a good reason to not use "-m" for
>> "merge".
>
> It means --merge plenty of times:
>
> * git restore -m
> * git checkout -m
> * git rebase -m
> * git diff -m
> * git read-tree -m
> * git diff-tree -m
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.
--
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
next prev parent reply other threads:[~2021-07-28 7:44 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 [this message]
2021-07-28 17:18 ` Junio C Hamano
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=9e8f1c87-cd08-e1a2-fd5d-713cb0590049@aixigo.com \
--to=matthias.baumgarten@aixigo.com \
--cc=alexhenrie24@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).