On Thu, Dec 10, 2020 at 9:04 AM Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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
