diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-12-22 20:38:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-22 20:38:07 -0800 |
| commit | c2999adcd5a7577ac445c4a9e6dd69d4b12a3664 (patch) | |
| tree | 4fc72e90a0d35c48fb6456a835cbdf938fefb869 | |
| parent | a7b5e9141ea50ed8f85379a53e550008dff2bda2 (diff) | |
| parent | bd52900df474cfbc67c89e3a2fb30e7ed2df8e78 (diff) | |
| download | git-c2999adcd5a7577ac445c4a9e6dd69d4b12a3664.tar.gz | |
Merge branch 'jc/doc-diff-blobs' into maint
* jc/doc-diff-blobs:
Documentation: Describe "git diff <blob> <blob>" separately
| -rw-r--r-- | Documentation/git-diff.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index f8d0819113..f8c06013f3 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -12,6 +12,7 @@ SYNOPSIS 'git diff' [options] [<commit>] [--] [<path>...] 'git diff' [options] --cached [<commit>] [--] [<path>...] 'git diff' [options] <commit> <commit> [--] [<path>...] +'git diff' [options] <blob> <blob> 'git diff' [options] [--no-index] [--] <path> <path> DESCRIPTION @@ -55,6 +56,11 @@ 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 @@ -72,8 +78,7 @@ directories. This behavior can be forced by --no-index. Just in case if you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use ".." notations, can be any -<tree>. The third form ('git diff <commit> <commit>') can also -be used to compare two <blob> objects. +<tree>. For a more complete list of ways to spell <commit>, see "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. |