1. Stefan Saasen
  2. git


Jonathan Nieder  committed 2475770

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>

  • Participants
  • Parent commits b77134b
  • Branches master

Comments (0)

Files changed (1)

File Documentation/git-diff.txt

View file
  • Ignore whitespace
 	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>...]::