Skip to content

Commit d7747bd

Browse files
kjbracey2gitster
authored andcommitted
Documentation: Move "git diff <blob> <blob>"
The section describing "git diff <blob> <blob>" had been placed in a position that disrupted the statement "This is synonymous to the previous form". Reorder to place this form after all the <commit>-using forms, and the note applying to them. Also mention this form in the initial description paragraph. Signed-off-by: Kevin Bracey <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 04a74b6 commit d7747bd

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Documentation/git-diff.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ SYNOPSIS
1818
DESCRIPTION
1919
-----------
2020
Show changes between the working tree and the index or a tree, changes
21-
between the index and a tree, changes between two trees, or changes
22-
between two files on disk.
21+
between the index and a tree, changes between two trees, changes between
22+
two blob objects, or changes between two files on disk.
2323

2424
'git diff' [--options] [--] [<path>...]::
2525

@@ -56,11 +56,6 @@ directories. This behavior can be forced by --no-index.
5656
This is to view the changes between two arbitrary
5757
<commit>.
5858

59-
'git diff' [options] <blob> <blob>::
60-
61-
This form is to view the differences between the raw
62-
contents of two blob objects.
63-
6459
'git diff' [--options] <commit>..<commit> [--] [<path>...]::
6560

6661
This is synonymous to the previous form. If <commit> on
@@ -87,6 +82,11 @@ and the range notations ("<commit>..<commit>" and
8782
"<commit>\...<commit>") do not mean a range as defined in the
8883
"SPECIFYING RANGES" section in linkgit:gitrevisions[7].
8984

85+
'git diff' [options] <blob> <blob>::
86+
87+
This form is to view the differences between the raw
88+
contents of two blob objects.
89+
9090
OPTIONS
9191
-------
9292
:git-diff: 1

0 commit comments

Comments
 (0)