X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff-files.html;h=b016af6161017dad7fb12cf9c50f9926e6c74695;hb=6112cadb5b8a815a65e9924344a663ee16c6723f;hp=1f7197aa9952739fe2c06d86d06c9cad455fe751;hpb=6ec31b9133a8c5decd8c2ced0f38de3a40041ca4;p=git.git diff --git a/git-diff-files.html b/git-diff-files.html index 1f7197aa..b016af61 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -301,6 +301,30 @@ same as "git-diff-index" and "git-diff-tree".

+--patch-with-raw +
+
+

+ Generate patch but keep also the default raw diff output. +

+
+
+--stat +
+
+

+ Generate a diffstat instead of a patch. +

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

+ Generate patch and prepend its diffstat. +

+
+
-z
@@ -431,6 +455,15 @@ same as "git-diff-index" and "git-diff-tree".

+--pickaxe-regex +
+
+

+ Make the <string> not a plain string but an extended POSIX + regex to match. +

+
+
-O<orderfile>
@@ -805,7 +838,7 @@ two unresolved merge parents with the working tree file