From: Felipe Contreras <felipe.contreras@gmail•com>
To: Junio C Hamano <gitster@pobox•com>,
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 14:25:43 -0500 [thread overview]
Message-ID: <6101af37cabc_41362084d@natae.notmuch> (raw)
In-Reply-To: <xmqqv94u9x2l.fsf@gitster.g>
Junio C Hamano wrote:
> 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.
The question shouldn't be "can it be ambiguous?", the question should be
"is it ambiguous?".
The *main* purpose of `git pull` is to integrate remote changes, and the
first question asked is "how?".
git pull --merge|-m
git pull --rebase|-r
So I don't see why it is ambiguous.
The fact that a tiny minority of users might find a command (any command)
ambiguous is not valid reason for its inexistence. By that rationale
`git pull` shouldn't exist at all, because many find it ambiguous that
it's not the symmetric command opposed to `git push`.
The vast majority of users shouldn't suffer because of the confusion of
a tiny few. The tiny few can simply look at the documentation.
--
Felipe Contreras
next prev parent reply other threads:[~2021-07-28 19:25 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
2021-07-28 18:18 ` Matthias Baumgarten
2021-07-28 19:25 ` Felipe Contreras [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6101af37cabc_41362084d@natae.notmuch \
--to=felipe.contreras@gmail$(echo .)com \
--cc=alexhenrie24@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=matthias.baumgarten@aixigo$(echo .)com \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox