git-apply: creatign empty files is nonfatal

diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 77b1fb1799870ed6017f452b26ea940be05d4036..762546bfe93f2186887a815485b0003e7d6f5edb 100644 (file)
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -9,7 +9,7 @@ git-diff-tree - Compares the content and mode of blobs found via two tree object
 
 SYNOPSIS
 --------
-'git-diff-tree' [-p] [-r] [-z] [--stdin] [-M] [-R] [-C] [-S<string>] [-m] [-s] [-v] [-t] <tree-ish> <tree-ish> [<pattern>]\*
+'git-diff-tree' [-p] [-r] [-z] [--stdin] [-B] [-M] [-R] [-C] [-O<orderfile>] [-S<string>] [--pickaxe-all] [-m] [-s] [-v] [-t] <tree-ish> <tree-ish> [<pattern>]\*
 
 DESCRIPTION
 -----------
@@ -33,6 +33,9 @@ OPTIONS
        generate patch (see section on generating patches).  For
        git-diff-tree, this flag implies '-r' as well.
 
+-B::
+       Break complete rewrite changes into pairs of delete and create.
+
 -M::
        Detect renames.
 
@@ -40,11 +43,20 @@ OPTIONS
        Detect copies as well as renames.
 
 -R::
-       Output diff in reverse.
+       Swap two input trees.
 
 -S<string>::
        Look for differences that contains the change in <string>.
 
+--pickaxe-all::
+       When -S finds a change, show all the changes in that
+       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::
        recurse