From: Junio C Hamano Date: Wed, 26 Jun 2013 22:07:41 +0000 (-0700) Subject: Merge branch 'kb/diff-blob-blob-doc' X-Git-Tag: v1.8.4-rc0~125 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a036e4ebbf75e7f06fe88d8889f33b84ef5c8b4d?ds=inline;hp=-c Merge branch 'kb/diff-blob-blob-doc' * kb/diff-blob-blob-doc: Documentation: Move "git diff " --- a036e4ebbf75e7f06fe88d8889f33b84ef5c8b4d diff --combined Documentation/git-diff.txt index a7b46208f6,5effe97991..78d6d50489 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@@ -18,14 -18,14 +18,14 @@@ SYNOPSI 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] [--] [...]:: This form is to view the changes you made relative to the index (staging area for the next commit). In other - words, the differences are what you _could_ tell git to + words, the differences are what you _could_ tell Git to further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]. + @@@ -56,11 -56,6 +56,6 @@@ directories. This behavior can be force This is to view the changes between two arbitrary . - 'git diff' [options] :: - - This form is to view the differences between the raw - contents of two blob objects. - 'git diff' [--options] .. [--] [...]:: This is synonymous to the previous form. If on @@@ -87,6 -82,11 +82,11 @@@ and the range notations ("..\...") do not mean a range as defined in the "SPECIFYING RANGES" section in linkgit:gitrevisions[7]. + 'git diff' [options] :: + + This form is to view the differences between the raw + contents of two blob objects. + OPTIONS ------- :git-diff: 1