From: Felipe Contreras <felipe.contreras@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>, Git <git@vger.kernel.org>,
Emily Shaffer <emilyshaffer@google.com>
Subject: Re: fc/pull-merge-rebase, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)
Date: Thu, 10 Dec 2020 09:11:01 -0600 [thread overview]
Message-ID: <CAMP44s3oobEe9FWJBkvH++rN-J28i169yyimLza2Xg4FRT2x2A@mail.gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2012100543020.25979@tvgsbejvaqbjf.bet>
On Thu, Dec 10, 2020 at 9:04 AM Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> BTW I suspect that the test failures point to shortcomings in the patch
> series that should be addressed anyway. I saw at least one obvious
> omission: when `git pull -s <strategy>` is used, I find it relatively
> obvious that the user wanted that to imply `--merge`.
1. Those are not shortcomings [1]
2. The last patch is not meant to be applied today. That's why it's
prefixed as "future: ".
[1] https://gitlab.com/felipec/git/-/commit/29a28ad763d3231eb1e22867dcfa56e53c5b2be6
--
Felipe Contreras
next prev parent reply other threads:[~2020-12-10 15:12 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-09 1:31 What's cooking in git.git (Dec 2020, #01; Tue, 8) Junio C Hamano
2020-12-09 1:41 ` Taylor Blau
2020-12-10 2:02 ` Jonathan Tan
2020-12-09 2:45 ` Elijah Newren
2020-12-09 4:22 ` Junio C Hamano
2020-12-09 23:02 ` Taylor Blau
2020-12-10 0:57 ` Junio C Hamano
2020-12-10 2:57 ` Jonathan Tan
2020-12-09 14:09 ` fc/pull-merge-rebase, was " Johannes Schindelin
2020-12-09 21:28 ` Junio C Hamano
2020-12-10 0:31 ` Felipe Contreras
2020-12-10 4:40 ` Johannes Schindelin
2020-12-10 4:46 ` Johannes Schindelin
2020-12-10 15:11 ` Felipe Contreras [this message]
2020-12-10 15:27 ` Theodore Y. Ts'o
2020-12-10 18:28 ` Junio C Hamano
2020-12-11 1:33 ` Felipe Contreras
2020-12-11 7:17 ` Junio C Hamano
2020-12-11 14:10 ` Felipe Contreras
2020-12-11 22:09 ` Theodore Y. Ts'o
2020-12-12 0:43 ` Felipe Contreras
2020-12-10 0:27 ` Felipe Contreras
2020-12-11 5:59 ` Junio C Hamano
2020-12-09 14:11 ` js/init-defaultbranch-advice, " Johannes Schindelin
2020-12-09 21:57 ` Junio C Hamano
2020-12-10 4:54 ` Johannes Schindelin
2020-12-10 18:33 ` Junio C Hamano
2020-12-11 0:03 ` Felipe Contreras
2020-12-10 3:56 ` bc/rev-parse-path-format, " Johannes Schindelin
2020-12-10 18:34 ` Junio C Hamano
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=CAMP44s3oobEe9FWJBkvH++rN-J28i169yyimLza2Xg4FRT2x2A@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
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 NNTP newsgroup(s).