On Wed, Jul 29, 2020 at 01:56:59PM -0700, Junio C Hamano wrote: > > So let's move these options over to git-log and put them with the other > > diff options, giving a single "diff" section for the git-log > > documentation. We'll call it "Diff Formatting" but use the all-caps > > top-level header to match its sibling sections. And we'll rewrite the > > section intro to remove the useless bits and give a more generic > > overview of the section which can be later extended. > > Makes sense. I first was afraid of regressing "git show" > documentation because the conditional inclusion was > > > - > > -ifndef::git-shortlog[] > > -ifndef::git-rev-list[] > > -Diff Formatting > > -~~~~~~~~~~~~~~~ > > - > > but it seems that Documentation/git-show.txt does not even include > this section being moved in the first place. > > We might move these to a new file and include it from both git-log.txt > and git-show.txt but that can be left outside the topioc. Yeah. As I said earlier, the maze of includes is a bit of a mess. I did wonder whether git-show might need some mention of merge-handling, too, but it explicitly mentions that "--cc" is the default, and it contains the whole "combined diff" section by including diff-generate-patch.txt. So I think it's OK as-is, though I wouldn't object if anybody wanted to look at reorganizing all of the diff documentation. :) -Peff
