[PATCH 4/4] Documentation: update "git diff --no-index" description
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:49:45
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Originally "git diff --no-index" 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 changed to only trigger when paths outside the tracked tree are mentioned. Reported-by: Yann Dirson <redacted> Signed-off-by: Jonathan Nieder <redacted> --- 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 fe34d4e..dd1fb32 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>...]::
--
1.7.2.3