undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kb/diff-blob-blob-doc' into maint

Browse Source 
* kb/diff-blob-blob-doc:
  Documentation: Move "git diff <blob> <blob>"
This commit is contained in:
Junio C Hamano 2013-07-21 22:51:37 -07:00
commit eac00c508d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/git-diff.txt
View File

@ -18,8 +18,8 @@ SYNOPSIS
DESCRIPTION DESCRIPTION
----------- -----------
Show changes between the working tree and the index or a tree, changes 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 the index and a tree, changes between two trees, changes between
between two files on disk. two blob objects, or changes between two files on disk.
'git diff' [--options] [--] [<path>...]:: '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 This is to view the changes between two arbitrary
<commit>. <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>...]:: 'git diff' [--options] <commit>..<commit> [--] [<path>...]::
This is synonymous to the previous form. If <commit> on 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 "<commit>\...<commit>") do not mean a range as defined in the
"SPECIFYING RANGES" section in linkgit:gitrevisions[7]. "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 OPTIONS
------- -------
:git-diff: 1 :git-diff: 1