diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 14:34:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 14:34:00 -0700 |
| commit | e6f28d0b6c239f15760194c8b12afdaa1a7bdd34 (patch) | |
| tree | b782d1e78feb1a9f17131581d754b0e29abaa0b8 /git-diff.txt | |
| parent | 0e0e0d2656a57fd3628bb6dbdaf0096684ed24a9 (diff) | |
| download | git-htmldocs-e6f28d0b6c239f15760194c8b12afdaa1a7bdd34.tar.gz | |
Autogenerated HTML docs for v1.8.4-357-g8d83
Diffstat (limited to 'git-diff.txt')
| -rw-r--r-- | git-diff.txt | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/git-diff.txt b/git-diff.txt index 78d6d5048..33fbd8c56 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -28,10 +28,15 @@ two blob objects, or changes between two files on disk. 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]. -+ -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' --no-index [--options] [--] [<path>...]:: + + This form is to compare the given two paths on the + filesystem. You can omit the `--no-index` option when + running the command in a working tree controlled by Git and + at least one of the paths points outside the working tree, + or when running the command outside a working tree + controlled by Git. 'git diff' [--options] --cached [<commit>] [--] [<path>...]:: |