Jeff King <peff@xxxxxxxx> writes: > On Tue, Aug 04, 2020 at 11:55:19PM +0300, Sergey Organov wrote: > >> I only don't like --diff-merges=none (even though it sounds great for >> --diff-parents=none) and used --diff-merges=off instead. It's not a >> strong feeling though, and I'm fine with whatever we decide. > > I think that is fine. I took "none" to be "diff against none of the > parents", which is the opposite of "all". But "off" conveys that, too. For now, "off" is OK, but then we'll regret when "all" comes, because "off" would not exactly sit opposite to "all". On the other hand, "none" would: Compare with all parents? Compare with none of the parents? Thanks.
