diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-26 15:07:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-26 15:07:41 -0700 |
| commit | a036e4ebbf75e7f06fe88d8889f33b84ef5c8b4d (patch) | |
| tree | 4b10f0ed6d5004027e5c5a11e08d74ed8592b5ee | |
| parent | Merge branch 'mm/push-force-is-dangerous' (diff) | |
| parent | Documentation: Move "git diff <blob> <blob>" (diff) | |
| download | tgif-a036e4ebbf75e7f06fe88d8889f33b84ef5c8b4d.tar.xz | |
Merge branch 'kb/diff-blob-blob-doc'
* kb/diff-blob-blob-doc:
Documentation: Move "git diff <blob> <blob>"
| -rw-r--r-- | Documentation/git-diff.txt | 14 |
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 |