summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-21 22:51:37 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-21 22:51:37 -0700
commiteac00c508df21f6675c07bbc559348eddd0fdd73 (patch)
tree0c1a204f097ead507cdfd994e7001ac3908a1988
parentMerge branch 'mm/merge-in-dirty-worktree-doc' into maint (diff)
parentDocumentation: Move "git diff <blob> <blob>" (diff)
downloadtgif-eac00c508df21f6675c07bbc559348eddd0fdd73.tar.xz
Merge branch 'kb/diff-blob-blob-doc' into maint
* kb/diff-blob-blob-doc: Documentation: Move "git diff <blob> <blob>"
-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 a7b46208f6..78d6d50489 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