[PATCH] Update git-diff-cache documentation.

The recent diff updates gave diff-cache the same ability to
filter paths, which was not properly documented.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/Documentation/git-diff-cache.txt b/Documentation/git-diff-cache.txt
index e89aaa503ff18bb96442f9ecf499bd5734679df5..35253b11b34b8b302ac264eaf90eadcdc2bf1555 100644 (file)
--- a/Documentation/git-diff-cache.txt
+++ b/Documentation/git-diff-cache.txt
@@ -9,13 +9,15 @@ git-diff-cache - Compares content and mode of blobs between the cache and reposi
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-diff-cache' [-p] [-r] [-z] [-m] [-M] [-R] [-C] [-S<string>] [--cached] <tree-ish>
+'git-diff-cache' [-p] [-r] [-z] [-m] [-M] [-R] [-C] [-S<string>] [--cached] <tree-ish> [<path>...]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

-Compares the content and mode of the blobs found via a tree object
-with the content of the current cache and, optionally ignoring the
-stat state of the file on disk.
+Compares the content and mode of the blobs found via a tree
+object with the content of the current cache and, optionally
+ignoring the stat state of the file on disk.  When paths are
+specified, compares only those named paths.  Otherwise all
+entries in the cache are compared.

 
 OPTIONS
 -------
 
 OPTIONS
 -------

diff --git a/diff-cache.c b/diff-cache.c
index 579a673f6a69e720c207083ef8cc2a97a4dd5d55..744fffb7c8c684e9d0206da36a0fba1c502570c9 100644 (file)
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -154,7 +154,7 @@ static void mark_merge_entries(void)
 }
 
 static char *diff_cache_usage =
 }
 
 static char *diff_cache_usage =

-"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish>";
+"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish> [<path>...]";

 
 int main(int argc, const char **argv)
 {
 
 int main(int argc, const char **argv)
 {