kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Update git-diff documentation 

Porcelain documentation should talk in terms of end-user workflow, not
in terms of implementation details.  Do not suggest update-index, but
git-add instead.  Explain differences among 0-, 1- and 2-tree cases
not as differences of number of trees given to the command, but say
why user would want to give these number of trees to the command in
what situation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2006-12-14 00:03:18 -08:00
parent 67bed724f2
commit f5e6b89b3a
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Documentation/git-diff.txt
View File

@ -14,30 +14,48 @@ DESCRIPTION
----------- -----------
Show changes between two trees, a tree and the working tree, a Show changes between two trees, a tree and the working tree, a
tree and the index file, or the index file and the working tree. tree and the index file, or the index file and the working tree.
The combination of what is compared with what is determined by
the number of trees given to the command.


* When no <tree-ish> is given, the working tree and the index 'git-diff' [--options] [--] [<path>...]::
file are compared, using `git-diff-files`.


* When one <tree-ish> is given, the working tree and the named This form is to view the changes you made relative to
tree are compared, using `git-diff-index`. The option the index (staging area for the next commit). In other
`--cached` can be given to compare the index file and words, the differences are what you _could_ tell git to
the named tree. further add to the index but you still haven't. You can
stage these changes by using gitlink:git-add[1].

'git-diff' [--options] --cached [<commit>] [--] [<path>...]::

This form is to view the changes you staged for the next
commit relative to the named <tree-ish>. Typically you
would want comparison with the latest commit, so if you
do not give <commit>, it defaults to HEAD.

'git-diff' [--options] <commit> -- [<path>...]::

This form is to view the changes you have in your
working tree relative to the named <commit>. You can
use HEAD to compare it with the latest commit, or a
branch name to compare with the tip of a different
branch.

'git-diff' [--options] <commit> <commit> -- [<path>...]::

This form is to view the changes between two <commit>,
for example, tips of two branches.

Just in case if you are doing something exotic, it should be
noted that all of the <commit> in the above description can be
any <tree-ish>.


* When two <tree-ish>s are given, these two trees are compared
using `git-diff-tree`.


OPTIONS OPTIONS
------- -------
--diff-options:: include::diff-options.txt[]
'--diff-options' are passed to the `git-diff-files`,
`git-diff-index`, and `git-diff-tree` commands. See the
documentation for these commands for description.


<path>...:: <path>...::
The <path> arguments are also passed to `git-diff-\*` The <paths> parameters, when given, are used to limit
commands. the diff to the named paths (you can give directory
names and get diff for all files under them).




EXAMPLES EXAMPLES
@ -51,7 +69,7 @@ $ git diff --cached <2>
$ git diff HEAD <3> $ git diff HEAD <3>
------------ ------------
+ +
<1> changes in the working tree since your last git-update-index. <1> changes in the working tree not yet staged for the next commit.
<2> changes between the index and your last commit; what you <2> changes between the index and your last commit; what you
would be committing if you run "git commit" without "-a" option. would be committing if you run "git commit" without "-a" option.
<3> changes in the working tree since your last commit; what you <3> changes in the working tree since your last commit; what you