From b1c006dd651fce55e25a7b06d00382cfdc1a3f91 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 23 May 2005 18:20:39 -0700 Subject: [PATCH] [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 Signed-off-by: Linus Torvalds --- 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 index e89aaa50..35253b11 100644 --- 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 -------- -'git-diff-cache' [-p] [-r] [-z] [-m] [-M] [-R] [-C] [-S] [--cached] +'git-diff-cache' [-p] [-r] [-z] [-m] [-M] [-R] [-C] [-S] [--cached] [...] 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 579a673f..744fffb7 100644 --- 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] [--cached] "; +"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S] [--cached] [...]"; int main(int argc, const char **argv) { -- 2.11.0