diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-07 01:11:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-05-07 01:11:00 -0700 |
| commit | 651df67bbc41e8d0cb84f35aa541542bd6806825 (patch) | |
| tree | e739dfd48f842c620d3bf4e3214c1aa85ed4f227 | |
| parent | e4f5b8c69d5f29b2b95b1febe76ccd91d1dffb33 (diff) | |
| download | git-651df67bbc41e8d0cb84f35aa541542bd6806825.tar.gz git-651df67bbc41e8d0cb84f35aa541542bd6806825.tar.xz | |
Fix usage string of git-diff-cache and add documentation of -m flag.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/core-git.txt | 9 | ||||
| -rw-r--r-- | diff-cache.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/core-git.txt b/Documentation/core-git.txt index 8bd893197..014b97964 100644 --- a/Documentation/core-git.txt +++ b/Documentation/core-git.txt @@ -241,7 +241,7 @@ Converts old-style GIT repository to the latest. ################################################################ git-diff-cache - git-diff-cache [-p] [-r] [-z] [--cached] <tree-ish> + git-diff-cache [-p] [-r] [-z] [-m] [--cached] <tree-ish> Compares the content and mode of the blobs found via a tree object with the content of the current cache and, optionally ignoring the @@ -264,6 +264,13 @@ stat state of the file on disk. --cached do not consider the on-disk file at all +-m + + By default, files recorded in the index but not checked + out are reported as deleted. This flag makes + git-diff-cache say that all non-checked-out files are up + to date. + Output format: See "Output format from git-diff-cache, git-diff-tree and git-diff-files" diff --git a/diff-cache.c b/diff-cache.c index 7e87d28f3..84527190f 100644 --- a/diff-cache.c +++ b/diff-cache.c @@ -165,7 +165,7 @@ static void mark_merge_entries(void) } static char *diff_cache_usage = -"diff-cache [-r] [-z] [-p] [-i] [--cached] <tree sha1>"; +"git-diff-cache [-p] [-r] [-z] [-m] [--cached] <tree sha1>"; int main(int argc, char **argv) { |