Skip to content

Commit 6ace09b

Browse files
jnavilagitster
authored andcommitted
doc: git-diff: apply format changes to diff-format
Signed-off-by: Jean-Noël Avila <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6b552e3 commit 6ace09b

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

Documentation/diff-format.txt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
Raw output format
22
-----------------
33

4-
The raw output format from "git-diff-index", "git-diff-tree",
5-
"git-diff-files" and "git diff --raw" are very similar.
4+
The raw output format from `git-diff-index`, `git-diff-tree`,
5+
`git-diff-files` and `git diff --raw` are very similar.
66

77
These commands all compare two sets of things; what is
88
compared differs:
99

10-
git-diff-index <tree-ish>::
11-
compares the <tree-ish> and the files on the filesystem.
10+
`git-diff-index <tree-ish>`::
11+
compares the _<tree-ish>_ and the files on the filesystem.
1212

13-
git-diff-index --cached <tree-ish>::
14-
compares the <tree-ish> and the index.
13+
`git-diff-index --cached <tree-ish>`::
14+
compares the _<tree-ish>_ and the index.
1515

16-
git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::
16+
`git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]`::
1717
compares the trees named by the two arguments.
1818

19-
git-diff-files [<pattern>...]::
19+
`git-diff-files [<pattern>...]`::
2020
compares the index and the files on the filesystem.
2121

22-
The "git-diff-tree" command begins its output by printing the hash of
22+
The `git-diff-tree` command begins its output by printing the hash of
2323
what is being compared. After that, all the commands print one output
2424
line per changed file.
2525

@@ -54,19 +54,19 @@ That is, from the left to the right:
5454

5555
Possible status letters are:
5656

57-
- A: addition of a file
58-
- C: copy of a file into a new one
59-
- D: deletion of a file
60-
- M: modification of the contents or mode of a file
61-
- R: renaming of a file
62-
- T: change in the type of the file (regular file, symbolic link or submodule)
63-
- U: file is unmerged (you must complete the merge before it can
57+
- `A`: addition of a file
58+
- `C`: copy of a file into a new one
59+
- `D`: deletion of a file
60+
- `M`: modification of the contents or mode of a file
61+
- `R`: renaming of a file
62+
- `T`: change in the type of the file (regular file, symbolic link or submodule)
63+
- `U`: file is unmerged (you must complete the merge before it can
6464
be committed)
65-
- X: "unknown" change type (most probably a bug, please report it)
65+
- `X`: "unknown" change type (most probably a bug, please report it)
6666

67-
Status letters C and R are always followed by a score (denoting the
67+
Status letters `C` and `R` are always followed by a score (denoting the
6868
percentage of similarity between the source and target of the move or
69-
copy). Status letter M may be followed by a score (denoting the
69+
copy). Status letter `M` may be followed by a score (denoting the
7070
percentage of dissimilarity) for file rewrites.
7171

7272
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.
8686
diff format for merges
8787
----------------------
8888

89-
"git-diff-tree", "git-diff-files" and "git-diff --raw"
89+
`git-diff-tree`, `git-diff-files` and `git-diff --raw`
9090
can take `-c` or `--cc` option
9191
to generate diff output also for merge commits. The output differs
9292
from the format described above in the following way:
@@ -128,7 +128,7 @@ other diff formats
128128
------------------
129129

130130
The `--summary` option describes newly added, deleted, renamed and
131-
copied files. The `--stat` option adds diffstat(1) graph to the
131+
copied files. The `--stat` option adds `diffstat`(1) graph to the
132132
output. These options can be combined with other options, such as
133133
`-p`, and are meant for human consumption.
134134

0 commit comments

Comments
 (0)