X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff.txt;h=044cee9b425bedc7addd9a4418b553557902711b;hb=b24bace5ca9420033be83ef6c14fb092c9371fe1;hp=6a098df26b1c1639f6ac88233b5642a2be9039fa;hpb=4a164d48df6bb1b4a771741c63d4437fd2dca0bb;p=git.git

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 6a098df26..044cee9b4 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc
 
 SYNOPSIS
 --------
-'git-diff' [ --diff-options ] <commit>{0,2} [--] [<path>...]
+'git-diff' [<common diff options>] <commit>{0,2} [--] [<path>...]
 
 DESCRIPTION
 -----------
@@ -23,6 +23,10 @@ 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 gitlink: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.
+
 'git-diff' [--options] --cached [<commit>] [--] [<path>...]::
 
 	This form is to view the changes you staged for the next