On Fri, Apr 10, 2020 at 3:30 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Elijah Newren <newren@xxxxxxxxx> writes: > > > On Fri, Apr 10, 2020 at 2:29 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > >> > >> Junio C Hamano <gitster@xxxxxxxxx> writes: > >> > >> > So I am OK to rebase the other topic to v2.26.0; would that help? I > >> > already saw there was some entanglement with the other topic in one > >> > of the patches in this series, so... > > ... > > Thanks, but wouldn't I want to base his patch on top of mine rather > > than vice versa? (Since mine might be labelled bugfix, and his is a > > new feature?) > > If you are willing to rebase the --[no-]keep-empty so that it does > not depend on v2.26, that may give us a better result. I just got > an impression that you somehow wanted to base your changes on the > newer codebase, but if you want to base both on the older codebase, > that is fine by me, too. Rebasing my stuff on the older codebase wouldn't make sense; the relevant code would be riddled with conflicts. Rather, I was thinking of rebasing Jonathan's changes and building his series on top of mine (and then touching up the docs so the flags reference each other).
