Junio C Hamano <gitster@xxxxxxxxx> writes: > Sergey Organov <sorganov@xxxxxxxxx> writes: > >> I had no intention to introduce --diff-parents, at least for now, and >> maybe never. What I said about it was theoretical discussion rather than >> actual proposal. >> >> If we agree on the above, I intended to instead propose something like: >> >> --diff-merges=first-parent or just =first > > OK, so the combined, combined-dense and split were meant to work > with all the parents, and off is the only one that means comparison > with no parents. That makes sense. Yeah, exactly, thanks! The only question regarding it I then have for now is what are preferences for names selection inside single option? Abbreviated yet somewhat sensible, or verbose? I mean: --diff-merges=first vs --diff-merges=first-parent --diff-merges=comb vs --diff-merges=combined etc. What's better? Thanks, -- Sergey
