undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Update git-diff-cache documentation.

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2005-05-23 18:20:39 -07:00 committed by Linus Torvalds
parent bceafe752c
commit b1c006dd65
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/git-diff-cache.txt
View File

@ -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 Compares the content and mode of the blobs found via a tree
with the content of the current cache and, optionally ignoring the object with the content of the current cache and, optionally
stat state of the file on disk. 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
------- -------

2
diff-cache.c
View File

@ -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)
{ {