From: "Jean-Noël Avila via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Jean-Noël Avila" <jn.avila@free.fr>,
"Jean-Noël Avila" <jn.avila@free.fr>
Subject: [PATCH 3/5] doc: git-diff: apply format changes to diff-format
Date: Sun, 04 Aug 2024 20:05:34 +0000 [thread overview]
Message-ID: <81b5782d152d87a695e9a2dc685bb2006dbf5190.1722801936.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1769.git.1722801936.gitgitgadget@gmail.com>
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
---
Documentation/diff-format.txt | 38 +++++++++++++++++------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index a3ae8747a22..34e703d58c4 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -1,25 +1,25 @@
Raw output format
-----------------
-The raw output format from "git-diff-index", "git-diff-tree",
-"git-diff-files" and "git diff --raw" are very similar.
+The raw output format from `git-diff-index`, `git-diff-tree`,
+`git-diff-files` and `git diff --raw` are very similar.
These commands all compare two sets of things; what is
compared differs:
-git-diff-index <tree-ish>::
+`git-diff-index` _<tree-ish>_::
compares the <tree-ish> and the files on the filesystem.
-git-diff-index --cached <tree-ish>::
+`git-diff-index --cached` _<tree-ish>_::
compares the <tree-ish> and the index.
-git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::
+`git-diff-tree` [`-r`] _<tree-ish-1>_ _<tree-ish-2>_ [_<pattern>_...]::
compares the trees named by the two arguments.
-git-diff-files [<pattern>...]::
+`git-diff-files` [_<pattern>_...]::
compares the index and the files on the filesystem.
-The "git-diff-tree" command begins its output by printing the hash of
+The `git-diff-tree` command begins its output by printing the hash of
what is being compared. After that, all the commands print one output
line per changed file.
@@ -54,19 +54,19 @@ That is, from the left to the right:
Possible status letters are:
-- A: addition of a file
-- C: copy of a file into a new one
-- D: deletion of a file
-- M: modification of the contents or mode of a file
-- R: renaming of a file
-- T: change in the type of the file (regular file, symbolic link or submodule)
-- U: file is unmerged (you must complete the merge before it can
+- `A`: addition of a file
+- `C`: copy of a file into a new one
+- `D`: deletion of a file
+- `M`: modification of the contents or mode of a file
+- `R`: renaming of a file
+- `T`: change in the type of the file (regular file, symbolic link or submodule)
+- `U`: file is unmerged (you must complete the merge before it can
be committed)
-- X: "unknown" change type (most probably a bug, please report it)
+- `X`: "unknown" change type (most probably a bug, please report it)
-Status letters C and R are always followed by a score (denoting the
+Status letters `C` and `R` are always followed by a score (denoting the
percentage of similarity between the source and target of the move or
-copy). Status letter M may be followed by a score (denoting the
+copy). Status letter `M` may be followed by a score (denoting the
percentage of dissimilarity) for file rewrites.
The sha1 for "dst" is shown as all 0's if a file on the filesystem
@@ -86,7 +86,7 @@ verbatim and the line is terminated by a NUL byte.
diff format for merges
----------------------
-"git-diff-tree", "git-diff-files" and "git-diff --raw"
+`git-diff-tree`, `git-diff-files` and `git-diff --raw`
can take `-c` or `--cc` option
to generate diff output also for merge commits. The output differs
from the format described above in the following way:
@@ -128,7 +128,7 @@ other diff formats
------------------
The `--summary` option describes newly added, deleted, renamed and
-copied files. The `--stat` option adds diffstat(1) graph to the
+copied files. The `--stat` option adds `diffstat`(1) graph to the
output. These options can be combined with other options, such as
`-p`, and are meant for human consumption.
--
gitgitgadget
next prev parent reply other threads:[~2024-08-04 20:05 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-04 20:05 [PATCH 0/5] doc: git diff reformatting Jean-Noël Avila via GitGitGadget
2024-08-04 20:05 ` [PATCH 1/5] doc: git-diff: apply new documentation guidelines Jean-Noël Avila via GitGitGadget
2024-08-05 9:11 ` Patrick Steinhardt
2024-08-05 18:51 ` Jean-Noël AVILA
2024-08-06 6:27 ` Patrick Steinhardt
2024-08-04 20:05 ` [PATCH 2/5] doc: git-diff: apply format changes to diff-options Jean-Noël Avila via GitGitGadget
2024-08-04 20:05 ` Jean-Noël Avila via GitGitGadget [this message]
2024-08-04 20:05 ` [PATCH 4/5] doc: git-diff: apply format changes to diff-generate-patch Jean-Noël Avila via GitGitGadget
2024-08-05 5:53 ` Johannes Sixt
2024-08-05 16:08 ` Junio C Hamano
2024-08-07 20:43 ` [RFC] formatting macro Jean-Noël AVILA
2024-08-12 6:35 ` Johannes Sixt
2024-08-12 15:22 ` Junio C Hamano
2024-08-13 20:42 ` Jean-Noël AVILA
2024-08-05 20:12 ` [PATCH 4/5] doc: git-diff: apply format changes to diff-generate-patch Jean-Noël AVILA
2024-08-04 20:05 ` [PATCH 5/5] doc: git-diff: apply format changes to config part Jean-Noël Avila via GitGitGadget
2024-11-11 16:53 ` [PATCH v2 0/5] doc: git diff reformatting Jean-Noël Avila via GitGitGadget
2024-11-11 16:53 ` [PATCH v2 1/5] doc: git-diff: apply new documentation guidelines Jean-Noël Avila via GitGitGadget
2024-11-12 0:48 ` Junio C Hamano
2024-11-12 8:40 ` Jean-Noël Avila
2024-11-12 9:13 ` Junio C Hamano
2024-11-12 18:28 ` Johannes Sixt
2024-11-12 23:01 ` Junio C Hamano
2024-11-13 7:31 ` Johannes Sixt
2024-11-13 8:59 ` Jean-Noël Avila
2024-11-11 16:53 ` [PATCH v2 2/5] doc: git-diff: apply format changes to diff-options Jean-Noël Avila via GitGitGadget
2024-11-12 0:52 ` Junio C Hamano
2024-11-12 9:04 ` Jean-Noël Avila
2024-11-12 9:14 ` Junio C Hamano
2024-11-11 16:53 ` [PATCH v2 3/5] doc: git-diff: apply format changes to diff-format Jean-Noël Avila via GitGitGadget
2024-11-12 18:51 ` Johannes Sixt
2024-11-12 23:03 ` Junio C Hamano
2024-11-13 7:39 ` Johannes Sixt
2024-11-13 8:10 ` Jean-Noël Avila
2024-11-11 16:53 ` [PATCH v2 4/5] doc: git-diff: apply format changes to diff-generate-patch Jean-Noël Avila via GitGitGadget
2024-11-11 16:53 ` [PATCH v2 5/5] doc: git-diff: apply format changes to config part Jean-Noël Avila via GitGitGadget
2024-11-12 18:51 ` Johannes Sixt
2024-11-13 8:12 ` Jean-Noël Avila
2024-11-16 19:36 ` [PATCH v3 0/5] doc: git diff reformatting Jean-Noël Avila via GitGitGadget
2024-11-16 19:36 ` [PATCH v3 1/5] doc: git-diff: apply new documentation guidelines Jean-Noël Avila via GitGitGadget
2024-11-17 14:04 ` Johannes Sixt
2024-11-17 16:44 ` Jean-Noël AVILA
2024-11-18 0:35 ` Junio C Hamano
2024-11-18 0:27 ` Junio C Hamano
2024-11-16 19:36 ` [PATCH v3 2/5] doc: git-diff: apply format changes to diff-options Jean-Noël Avila via GitGitGadget
2024-11-16 19:36 ` [PATCH v3 3/5] doc: git-diff: apply format changes to diff-format Jean-Noël Avila via GitGitGadget
2024-11-16 19:36 ` [PATCH v3 4/5] doc: git-diff: apply format changes to diff-generate-patch Jean-Noël Avila via GitGitGadget
2024-11-16 19:36 ` [PATCH v3 5/5] doc: git-diff: apply format changes to config part Jean-Noël Avila via GitGitGadget
2024-11-18 22:05 ` [PATCH v4 0/5] doc: git diff reformatting Jean-Noël Avila via GitGitGadget
2024-11-18 22:05 ` [PATCH v4 1/5] doc: git-diff: apply new documentation guidelines Jean-Noël Avila via GitGitGadget
2025-03-31 9:37 ` SZEDER Gábor
2025-03-31 12:55 ` [PATCH] doc: fix asciidoctor synopsis processing of triple-dots Jean-Noël Avila
2025-03-31 17:45 ` SZEDER Gábor
2025-03-31 20:30 ` Jean-Noël AVILA
2025-04-01 11:08 ` Jean-Noël Avila
2025-04-01 21:48 ` Junio C Hamano
2025-04-02 6:49 ` Jean-Noël Avila
2025-04-07 15:11 ` Junio C Hamano
2024-11-18 22:05 ` [PATCH v4 2/5] doc: git-diff: apply format changes to diff-options Jean-Noël Avila via GitGitGadget
2024-11-18 22:05 ` [PATCH v4 3/5] doc: git-diff: apply format changes to diff-format Jean-Noël Avila via GitGitGadget
2024-11-18 22:05 ` [PATCH v4 4/5] doc: git-diff: apply format changes to diff-generate-patch Jean-Noël Avila via GitGitGadget
2024-11-18 22:05 ` [PATCH v4 5/5] doc: git-diff: apply format changes to config part Jean-Noël Avila via GitGitGadget
2024-11-26 4:32 ` [PATCH v4 0/5] doc: git diff reformatting Junio C Hamano
2024-11-26 6:55 ` Johannes Sixt
2024-11-26 7:15 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81b5782d152d87a695e9a2dc685bb2006dbf5190.1722801936.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=jn.avila@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).