summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bceafe7)
raw | patch | inline | side by side (parent: bceafe7)
author | Junio C Hamano <junkio@cox.net> | |
Tue, 24 May 2005 01:20:39 +0000 (18:20 -0700) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Tue, 24 May 2005 02:17:06 +0000 (19:17 -0700) |
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>
filter paths, which was not properly documented.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Documentation/git-diff-cache.txt | patch | blob | history | |
diff-cache.c | patch | blob | history |
index e89aaa503ff18bb96442f9ecf499bd5734679df5..35253b11b34b8b302ac264eaf90eadcdc2bf1555 100644 (file)
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
-----------
-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
-------
diff --git a/diff-cache.c b/diff-cache.c
index 579a673f6a69e720c207083ef8cc2a97a4dd5d55..744fffb7c8c684e9d0206da36a0fba1c502570c9 100644 (file)
--- a/diff-cache.c
+++ b/diff-cache.c
}
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)
{