diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2006-12-14 11:20:06 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2006-12-14 11:20:06 +0000 |
commit | 47848ae0b2e2aa48f285bef6aa9fde0efa4295cd (patch) | |
tree | 909812fb7789b820318c9808ae4deaf6a2b5eefe /git-diff.txt | |
parent | e7935c49199b7d60c02043382b62ce70d36017e9 (diff) | |
download | git-htmldocs-47848ae0b2e2aa48f285bef6aa9fde0efa4295cd.tar.gz |
Autogenerated HTML docs for v1.4.4.2-g02c9
Diffstat (limited to 'git-diff.txt')
-rw-r--r-- | git-diff.txt | 56 |
1 files changed, 36 insertions, 20 deletions
diff --git a/git-diff.txt b/git-diff.txt index 3144864d8..127d68c96 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -14,32 +14,48 @@ DESCRIPTION ----------- 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. -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 - file are compared, using `git-diff-files`. +'git-diff' [--options] [--] [<path>...]:: -* When one <tree-ish> is given, the working tree and the named - tree are compared, using `git-diff-index`. The option - `--index` can be given to compare the index file and - the named tree. - `--cached` is a deprecated alias for `--index`. It's use is - discouraged. + 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 + 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 ------- ---diff-options:: - '--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. +include::diff-options.txt[] <path>...:: - The <path> arguments are also passed to `git-diff-\*` - commands. + The <paths> parameters, when given, are used to limit + the diff to the named paths (you can give directory + names and get diff for all files under them). EXAMPLES @@ -49,11 +65,11 @@ Various ways to check your working tree:: + ------------ $ git diff <1> -$ git diff --index <2> +$ git diff --cached <2> $ 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 would be committing if you run "git commit" without "-a" option. <3> changes in the working tree since your last commit; what you |