Jeff King <peff@xxxxxxxx> writes: > On Mon, Aug 03, 2020 at 11:25:05PM +0300, Sergey Organov wrote: > >> I mean, why introduce --[no-]diff-merges in the first place, if we do >> agree --xxx=(none|...) is where we'd like to end up? I thought the >> answer was "it's too late", but in fact it was an answer to changing >> semantics of -m that I don't think I suggest. > > Spelling out the between the lines of my answer a bit more, it was > really: I am happy enough with the topic as-is and do not want to rework > it again. But if _you_ want to do so, I have no problem with it. :) OK, I see! > >> As a side-note, my secret hope is for pure "git log -p" to give me diff >> against first parent for all the commits, no matter how many parents >> they happen to have. This desire still sounds like a job for >> configuration option though, rather than, or in addition to, >> --diff-merges or --diff-parents? We well can later introduce a >> config to assume --diff-merges=<config> when no explicit >> --diff-merges=<value> is specified, right? > > Yes, I think a config there would be reasonable as long as: > > - we have the command-line options to counteract it when necessary > (i.e., --diff-parents or your advanced --diff-merges exists, too) > > - it only impacts porcelain "git log", and not plumbing like > diff-tree. Yeah, these two are totally agreed upon. Thanks, -- Sergey
