[PATCH] Update git-diff-cache documentation.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:41:58
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
The recent diff updates gave diff-cache the same ability to filter paths, which was not properly documented. Signed-off-by: Junio C Hamano <redacted> --- Documentation/git-diff-cache.txt | 10 ++++++---- diff-cache.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-diff-cache.txt b/Documentation/git-diff-cache.txt
--- a/Documentation/git-diff-cache.txt
+++ b/Documentation/git-diff-cache.txt@@ -9,13 +9,15 @@ git-diff-cache - Compares content and mo 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
--- a/diff-cache.c
+++ b/diff-cache.c@@ -154,7 +154,7 @@ static void mark_merge_entries(void) } 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) { ------------------------------------------------