X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff-files.html;h=219776571db05c5ad8677d2a2afd6f9b42353308;hb=bb8fb05ed082c81af81f9eecf356f993e2ef83b7;hp=d66d18a6d9451ba3cf92472e15546eea7684efcb;hpb=ba7c8d8333e364d5b3a960b19e3b0fc6e867c928;p=git.git diff --git a/git-diff-files.html b/git-diff-files.html index d66d18a6..21977657 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -317,6 +317,23 @@ same as "git-diff-index" and "git-diff-tree".

+--summary +
+
+

+ Output a condensed summary of extended header information + such as creations, renames and mode changes. +

+
+
+--patch-with-stat +
+
+

+ Generate patch and prepend its diffstat. +

+
+
-z
@@ -830,7 +847,7 @@ two unresolved merge parents with the working tree file