On Fri, Aug 11, 2017 at 5:39 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Jonathan Tan <jonathantanmy@xxxxxxxxxx> writes: > >> Note that these patches are for "next", depending on the "--color-moved" >> patches. > > As we have finished Git 2.14 cycle, in preparation for the next one, > the 'next' branch will be rewound and rebuilt early next week. I do > not mind tentatively ejecting some topics that needs fix-ups out of > 'next' to give them a clean restart. These would cleanly apply on sb/diff-color-move. > > My preference however is to keep sb/diff-color-move topic as-is > without replacing and fixing it with incremental updates like these > patches. I would have hoped to not need to reroll that topic. Though I do find patches 1&2 valuable either on top or squashed into "[PATCH] diff.c: color moved lines differently" and "[PATCH] diff.c: color moved lines differently, plain mode" respectively. So I'd ask to pick at least patches 1&2 on top of that series, please? (I am missing the context for *why* you preference is to not do exactly this). Thanks.
