summaryrefslogtreecommitdiff
path: root/Documentation/git-diff.txt
diff options
context:
space:
mode:
authorKevin Bracey <kevin@bracey.fi>2013-06-18 14:58:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-18 16:33:12 (GMT)
commitd7747bd5bcba5eaeda690d7d5897462580f3c0e4 (patch)
tree27cc6ba668cd024f9e28e4f62acd30da820b1897 /Documentation/git-diff.txt
parent04a74b6cfa5ef4870263f84ac94a488d9f2ef14a (diff)
downloadgit-d7747bd5bcba5eaeda690d7d5897462580f3c0e4.zip
git-d7747bd5bcba5eaeda690d7d5897462580f3c0e4.tar.gz
git-d7747bd5bcba5eaeda690d7d5897462580f3c0e4.tar.bz2
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>
Diffstat (limited to 'Documentation/git-diff.txt')
-rw-r--r--Documentation/git-diff.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index f8c0601..5effe97 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -18,8 +18,8 @@ SYNOPSIS
DESCRIPTION
-----------
Show changes between the working tree and the index or a tree, changes
-between the index and a tree, changes between two trees, or changes
-between two files on disk.
+between the index and a tree, changes between two trees, changes between
+two blob objects, or changes between two files on disk.
'git diff' [--options] [--] [<path>...]::
@@ -56,11 +56,6 @@ directories. This behavior can be forced by --no-index.
This is to view the changes between two arbitrary
<commit>.
-'git diff' [options] <blob> <blob>::
-
- This form is to view the differences between the raw
- contents of two blob objects.
-
'git diff' [--options] <commit>..<commit> [--] [<path>...]::
This is synonymous to the previous form. If <commit> on
@@ -87,6 +82,11 @@ and the range notations ("<commit>..<commit>" and
"<commit>\...<commit>") do not mean a range as defined in the
"SPECIFYING RANGES" section in linkgit:gitrevisions[7].
+'git diff' [options] <blob> <blob>::
+
+ This form is to view the differences between the raw
+ contents of two blob objects.
+
OPTIONS
-------
:git-diff: 1