Anonymous committed c2999ad Merge

Merge branch 'jc/doc-diff-blobs' into maint

* jc/doc-diff-blobs:
Documentation: Describe "git diff <blob> <blob>" separately

  • Participants
  • Parent commits a7b5e91, bd52900

Comments (0)

Files changed (1)

File Documentation/git-diff.txt

 '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>
 	This is to view the changes between two arbitrary
+'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
 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.
 For a more complete list of ways to spell <commit>, see
 "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7].