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. -Peff