aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-07 01:11:00 -0700
committerJunio C Hamano <junkio@cox.net>2005-05-07 01:11:00 -0700
commit651df67bbc41e8d0cb84f35aa541542bd6806825 (patch)
treee739dfd48f842c620d3bf4e3214c1aa85ed4f227 /Documentation
parente4f5b8c69d5f29b2b95b1febe76ccd91d1dffb33 (diff)
downloadgit-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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/core-git.txt9
1 files changed, 8 insertions, 1 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"