On Wed, Jul 29, 2020 at 1:10 PM Jeff King <peff@xxxxxxxx> wrote: > Here's a re-roll taking into account the discussion so far: > > - the escape hatch option name is flipped to "--no-diff-merges" (with > "--diff-merges" matching "-m") > > - the documentation now discusses the change as well as the existing > handling of merges; this involved a few extra cleanups. Try > "doc-diff" for a better view of the actual rendered changes. > > I do think longer term we'd be better off to stop having this maze > of ifdef'd inclusions, and just have gitdiff(7) which covers all of > the possibilities in human-readable text (so yes, you might see a > mention of diff-files while you're looking for info on git-log, but > that would also broaden your mind about how the different commands > work). But that's clearly outside the scope of this series. I think > what's here is a strict improvement. I agree. The new series looks good. Chris
