Skip to content

Commit

Permalink
[PATCH] Update git-diff-cache documentation.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano authored and Linus Torvalds committed May 24, 2005
1 parent bceafe7 commit b1c006d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions Documentation/git-diff-cache.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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<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
-------
Expand Down
2 changes: 1 addition & 1 deletion diff-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit b1c006d

Please sign in to comment.