From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 10 Dec 2020 15:11:01 GMT
Subject: Re: fc/pull-merge-rebase, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)
Message-ID: <CAMP44s3oobEe9FWJBkvH++rN-J28i169yyimLza2Xg4FRT2x2A@mail.gmail.com>
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