diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-10-11 11:06:18 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-13 19:10:56 -0700 |
| commit | 24757702395ed4c828af585f2d8ba0efda5cf697 (patch) | |
| tree | cfd89637f8f3316eaafe46ee567be70307bf3b51 | |
| parent | b77134b068f777c9b63ebfb8762c77968c49702f (diff) | |
| download | git-24757702395ed4c828af585f2d8ba0efda5cf697.tar.gz git-24757702395ed4c828af585f2d8ba0efda5cf697.tar.xz | |
Documentation: update implicit "--no-index" behavior in "git diff"
Originally "--no-index" mode triggered for untracked files within the
tracked tree, but with v1.5.6-rc1~41 (Merge branch 'jc/diff-no-no-index,
2008-05-26) the command was fixed to only implicitly trigger when paths
outside the tracked tree are mentioned.
Reported-by: Yann Dirson <dirson@bertin.fr>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-diff.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index fe34d4edb..dd1fb3278 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/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>...]:: |