[PATCH] read-tree: save more user hassles during fast-forward.

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

diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 7013640..58137b3 100644 (file)
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -9,7 +9,7 @@ git-diff-files - Compares files in the working tree and the cache
 
 SYNOPSIS
 --------
-'git-diff-files' [-p] [-q] [-r] [-z] [-M] [-C] [-R] [-S<string>] [--pickaxe-all] [<pattern>...]
+'git-diff-files' [-p] [-q] [-r] [-z] [-B] [-M] [-C] [-R] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<pattern>...]
 
 DESCRIPTION
 -----------
@@ -27,7 +27,11 @@ OPTIONS
        Remain silent even on nonexisting files
 
 -R::
-       Output diff in reverse.
+       Swap two inputs; that is, show differences from on-disk files
+       to cache contents.
+
+-B::
+       Break complete rewrite changes into pairs of delete and create.
 
 -M::
        Detect renames.
@@ -43,6 +47,10 @@ 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::
        This flag does not mean anything.  It is there only to match
        git-diff-tree.  Unlike git-diff-tree, git-diff-files always looks