Junio C Hamano <gitster@xxxxxxxxx> writes: > Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes: > >> This is a WIP series I have that I figured I'd send out as-is for >> comment since Junio said he'd be merging dl/rebase-i-keep-base down. >> >> So I wanted to test it, and as seen early in this series in 3/13 and >> 4/13 we had significant blindspots in our tests, i.e. there were no >> tests for whether --no-ff bypassed the amended logic as it should. >> >> As seen from those tests we may have some bugs here, either existing >> or new, needs more poking at it. > > Thanks. I am actually OK to keep dl/rebase-i-keep-base out of > 'next' to iron out the kinks. It's not like we are in a hurry to > deliber an important fix to our users---the topic is adding a new > feature and attempting to fix a minor irritation (i.e. lost > opportunity to fast-forward). The 'next' branch has thinned down sufficiently that it may be a good time to resurrect topics like this one that we postponed. If there is (still) interest in them, that is, which I do not know ;-)
