X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff-stages.html;h=aff4b3e1c23cb39d6c860490e69fa9eceecfa5c3;hb=ba7c8d8333e364d5b3a960b19e3b0fc6e867c928;hp=1fd8955c35f85ab91517513f298c071e93768904;hpb=bfe9e75ebe8d3a83be46406130c76d54f8b14289;p=git.git diff --git a/git-diff-stages.html b/git-diff-stages.html index 1fd8955c..aff4b3e1 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -299,6 +299,22 @@ unmerged index file.

+--patch-with-raw +
+
+

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

+
+
+--stat +
+
+

+ Generate a diffstat instead of a patch. +

+
+
-z
@@ -788,7 +804,7 @@ two unresolved merge parents with the working tree file