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 <kevin@bracey.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kevin Bracey committed
Jun 18, 2013 at 17:58 UTC
d7747bd5bcba5eaeda690d7d5897462580f3c0e4
1 file changed
+7
-7
Documentation/git-diff.txt
+7
-7
@@ -18,8 +18,8 @@ SYNOPSIS
18
DESCRIPTION
19
-----------
20
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.
23
24
'git diff' [--options] [--] [<path>...]::
25
@@ -56,11 +56,6 @@ directories. This behavior can be forced by --no-index.
56
This is to view the changes between two arbitrary
57
<commit>.
58
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
-
59
'git diff' [--options] <commit>..<commit> [--] [<path>...]::
60
61
This is synonymous to the previous form. If <commit> on
@@ -87,6 +82,11 @@ and the range notations ("<commit>..<commit>" and
82
"<commit>\...<commit>") do not mean a range as defined in the
83
"SPECIFYING RANGES" section in linkgit:gitrevisions[7].
84
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
+
90
OPTIONS
91
-------
92
:git-diff: 1