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>
Jonathan Nieder committed
Oct 11, 2010 at 11:06 UTC
24757702395ed4c828af585f2d8ba0efda5cf697
1 file changed
+3
-3
Documentation/git-diff.txt
+3
-3
@@ -23,9 +23,9 @@ tree and the index file, or the index file and the working tree.
23
further add to the index but you still haven't. You can
24
stage these changes by using linkgit:git-add[1].
25
+
26
-If exactly two paths are given, and at least one is untracked,
27
-compare the two files / directories. This behavior can be
28
-forced by --no-index.
26
+If exactly two paths are given and at least one points outside
27
+the current repository, 'git diff' will compare the two files /
28
+directories. This behavior can be forced by --no-index.
29
30
'git diff' [--options] --cached [<commit>] [--] [<path>...]::
31