Subject: [PATCH v4 0/5] doc: git diff reformatting

From: "Jean-Noël Avila via GitGitGadget" <[email-masked]>
Date: Mon, 18 Nov 2024 22:05:48 +0000

This is the continuation of the editing of the manpages to reflect the new
formatting rules.

Changes since V3:

 * rework the description about -1, --base,...

Jean-Noël Avila (5):
  doc: git-diff: apply new documentation guidelines
  doc: git-diff: apply format changes to diff-options
  doc: git-diff: apply format changes to diff-format
  doc: git-diff: apply format changes to diff-generate-patch
  doc: git-diff: apply format changes to config part

 Documentation/config/diff.txt         | 204 +++++++------
 Documentation/diff-format.txt         |  42 +--
 Documentation/diff-generate-patch.txt |  44 +--
 Documentation/diff-options.txt        | 423 +++++++++++++-------------
 Documentation/git-diff.txt            | 122 ++++----
 5 files changed, 433 insertions(+), 402 deletions(-)

base-commit: facbe4f633e4ad31e641f64617bc88074c659959
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1769%2Fjnavila%2Fgit_diff_new-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1769/jnavila/git_diff_new-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/1769

Range-diff vs v3:

 1:  6841bd5825b ! 1:  fd3ee137fe4 doc: git-diff: apply new documentation guidelines
     @@ Documentation/git-diff.txt: OPTIONS
      --1 --base::
      --2 --ours::
      --3 --theirs::
     +-	Compare the working tree with the "base" version (stage #1),
     +-	"our branch" (stage #2) or "their branch" (stage #3).  The
     +-	index contains these stages only for unmerged entries i.e.
     +-	while resolving conflicts.  See linkgit:git-read-tree[1]
     +-	section "3-Way Merge" for detailed information.
      +`-1`::
      +`--base`::
     -+
     -+or `-2`::
     ++`-2`::
      +`--ours`::
     -+
     -+or `-3`::
     ++`-3`::
      +`--theirs`::
     - 	Compare the working tree with the "base" version (stage #1),
     - 	"our branch" (stage #2) or "their branch" (stage #3).  The
     - 	index contains these stages only for unmerged entries i.e.
     - 	while resolving conflicts.  See linkgit:git-read-tree[1]
     - 	section "3-Way Merge" for detailed information.
     ++	Compare the working tree with
     +++
     ++--
     ++ * the "base" version (stage #1) when using `-1` or `--base`,
     ++ * "our branch" (stage #2) when using `-2` or `--ours`, or
     ++ * "their branch" (stage #3) when using `-3` or `--theirs`.
     ++--
     +++
     ++The index contains these stages only for unmerged entries i.e.
     ++while resolving conflicts.  See linkgit:git-read-tree[1]
     ++section "3-Way Merge" for detailed information.
       
      --0::
      +`-0`::
 2:  07df397741b = 2:  a0a3986ea86 doc: git-diff: apply format changes to diff-options
 3:  698628e076b = 3:  aca3573cd95 doc: git-diff: apply format changes to diff-format
 4:  1154462f8be = 4:  0e6162d02d1 doc: git-diff: apply format changes to diff-generate-patch
 5:  4ec2fd9c3c6 = 5:  d350237eddb doc: git-diff: apply format changes to config part

-- 
gitgitgadget