From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
Git List Mailing <git@vger.kernel.org>,
Alex Henrie <alexhenrie24@gmail.com>
Subject: Re: [PATCH v2] pull: introduce --merge option
Date: Tue, 27 Jul 2021 01:31:50 -0500 [thread overview]
Message-ID: <60ffa856a332d_7d082086f@natae.notmuch> (raw)
In-Reply-To: <xmqqeebregns.fsf@gitster.g>
Junio C Hamano wrote:
> Linus Torvalds <torvalds@linux-foundation.org> writes:
>
> > On Wed, Jul 21, 2021 at 6:47 AM Felipe Contreras
> > <felipe.contreras@gmail.com> wrote:
> >>
> >> Users need to specify if they want to either --merge or --rebase, but
> >> unfortunately the former is missing.
> >
> > Ack. I think it's just historical, because long long ago it used to be
> > that 'git pull' always merged unless told otherwise with --rebase.
>
> The "--no-rebase" option, which is documented as a synonym for
> "--rebase=false", has been there, but the implementation is buggy in
> some corner cases, which has been worked on recently in a separate
> thread. I do not think it is too bad to add "--merge" as yet
> another synonym for "--rebase=false".
Any particular reason why this is not a topic? [1]
[1] https://lore.kernel.org/git/xmqq35s0fj9o.fsf@gitster.g/
--
Felipe Contreras
prev parent reply other threads:[~2021-07-27 6:31 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
2021-07-27 6:31 ` Felipe Contreras [this message]
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=60ffa856a332d_7d082086f@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@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).