diff options
author | Junio C Hamano <junio@kernel.org> | 2010-10-14 04:37:28 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-10-14 04:37:28 +0000 |
commit | c27b733bfcf3bef4722ef8d46334aff3e15e0cd2 (patch) | |
tree | 1a666e343738a0601732529bb7e0dc1be6775f96 /git-diff.txt | |
parent | 657fd8a8dd93c9d5c7534016aa6601c564fe2601 (diff) | |
download | git-htmldocs-c27b733bfcf3bef4722ef8d46334aff3e15e0cd2.tar.gz |
Autogenerated HTML docs for v1.7.3.1-120-g38a18
Diffstat (limited to 'git-diff.txt')
-rw-r--r-- | git-diff.txt | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/git-diff.txt b/git-diff.txt index 08fd4099a..dd1fb3278 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -23,9 +23,9 @@ tree and the index file, or the index file and the working tree. further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]. + -If exactly two paths are given, and at least one is untracked, -compare the two files / directories. This behavior can be -forced by --no-index. +If exactly two paths are given and at least one points outside +the current repository, 'git diff' will compare the two files / +directories. This behavior can be forced by --no-index. 'git diff' [--options] --cached [<commit>] [--] [<path>...]:: @@ -64,15 +64,16 @@ 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 -for the last two forms that use ".." notations, can be any -<tree-ish>. +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. For a more complete list of ways to spell <commit>, see -"SPECIFYING REVISIONS" section in linkgit:gitrevisions[1]. +"SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. However, "diff" is about comparing two _endpoints_, not ranges, and the range notations ("<commit>..<commit>" and "<commit>\...<commit>") do not mean a range as defined in the -"SPECIFYING RANGES" section in linkgit:gitrevisions[1]. +"SPECIFYING RANGES" section in linkgit:gitrevisions[7]. OPTIONS ------- @@ -159,8 +160,12 @@ rewrites (very expensive). SEE ALSO -------- -linkgit:git-difftool[1]:: - Show changes using common diff tools +diff(1), +linkgit:git-difftool[1], +linkgit:git-log[1], +linkgit:gitdiffcore[7], +linkgit:git-format-patch[1], +linkgit:git-apply[1] Author ------ |