From: Junio C Hamano <gitster@pobox.com>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Felipe Contreras <felipe.contreras@gmail.com>,
Git List Mailing <git@vger.kernel.org>
Subject: Re: [PATCH v2] pull: introduce --merge option
Date: Tue, 27 Jul 2021 01:45:15 -0700 [thread overview]
Message-ID: <xmqqwnpcdu1w.fsf@gitster.g> (raw)
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.
next prev parent reply other threads:[~2021-07-27 8:45 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 [this message]
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
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=xmqqwnpcdu1w.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=alexhenrie24@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--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).