X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff.txt;h=fc37ea7412ad5976ccaef0e198a19b5bf1ffe057;hb=4d3fe0c5f342d0b00209916cf6951c2f8db414d2;hp=f43a60f4f1a482d3a1c0e1816b4beedbb13ccf82;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index f43a60f4..fc37ea74 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -3,25 +3,39 @@ git-diff(1)
 
 NAME
 ----
-git-diff - Some git command not yet documented.
+git-diff - Show changes between commits, commit and working tree, etc.
 
 
 SYNOPSIS
 --------
-'git-diff' [ --option ] <args>...
+'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]
 
 DESCRIPTION
 -----------
-Does something not yet documented.
-
+Show changes between two ents, an ent and the working tree, an
+ent and the index file, or the index file and the working tree.
+The combination of what is compared with what is determined by
+the number of ents given to the command.
+
+`----------------`--------`-----------------------------`------------------
+Number of ents    Options  What's Compared               Underlying command
+---------------------------------------------------------------------------
+0                 -        index file and working tree   git-diff-files
+1                 --cached ent and index file            git-diff-index
+1                 -        ent and working tree          git-diff-index
+2                 -        two ents                      git-diff-tree
+---------------------------------------------------------------------------
 
 OPTIONS
 -------
---option::
-	Some option not yet documented.
-
-<args>...::
-	Some argument not yet documented.
+--diff-options::
+	'--diff-options' are passed to the `git-diff-files`,
+	`git-diff-index`, and `git-diff-tree` commands.  See the
+	documentation for these commands for description.
+
+<path>...::
+	The <path> arguments are also passed to `git-diff-\*`
+	commands.
 
 
 Author