Merge branch 'master' into next

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index ec6811c71885a9aa0a28626c46e0645cd79864ac..f523ec2fbea9a129294b960461c82382b41ac92d 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -4,6 +4,19 @@
 -u::
        Synonym for "-p".
 
+--patch-with-raw::
+       Generate patch but keep also the default raw diff output.
+
+--stat::
+       Generate a diffstat instead of a patch.
+
+--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::
        \0 line termination on output