git-cvsimport-script: more error handling

[git.git] / Documentation / git-diff-cache.txt

diff --git a/Documentation/git-diff-cache.txt b/Documentation/git-diff-cache.txt
index 0e2e6d0..f6dd703 100644 (file)
--- a/Documentation/git-diff-cache.txt
+++ b/Documentation/git-diff-cache.txt
@@ -9,7 +9,7 @@ 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>] [--pickaxe-all] [--cached] <tree-ish> [<path>...]
+'git-diff-cache' [-p] [-r] [-z] [-m] [--cached] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] <tree-ish> [<path>...]
 
 DESCRIPTION
 -----------
@@ -35,12 +35,23 @@ OPTIONS
 -z::
        \0 line termination on output
 
+-B::
+       Break complete rewrite changes into pairs of delete and create.
+
 -M::
        Detect renames.
 
 -C::
        Detect copies as well as renames.
 
+--find-copies-harder::
+       By default, -C option finds copies only if the original
+       file of the copy was modified in the same changeset for
+       performance reasons.  This flag makes the command
+       inspect unmodified files as candidates for the source of
+       copy.  This is a very expensive operation for large
+       projects, so use it with caution.
+
 -S<string>::
        Look for differences that contains the change in <string>.
 
@@ -49,8 +60,13 @@ OPTIONS
        changeset, not just the files that contains the change
        in <string>.
 
+-O<orderfile>::
+       Output the patch in the order specified in the
+       <orderfile>, which has one shell glob pattern per line.
+
 -R::
-       Output diff in reverse.
+       Swap two inputs; that is, show differences from cache or
+       on-disk file to tree contents.
 
 --cached::
        do not consider the on-disk file at all