Skip to content

Commit

Permalink
Documentation: Describe "git diff <blob> <blob>" separately
Browse files Browse the repository at this point in the history
As it was not a common operation, it was described as if it is a
side note for the more common two-commit variant, but this mode
behaves very differently, e.g. it does not make any sense to ask
recursive behaviour, or give the command a pathspec.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Dec 18, 2012
1 parent 7e20105 commit bd52900
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions Documentation/git-diff.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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].
Expand Down

0 comments on commit bd52900

Please sign in to comment.