Merge with git://kernel.org/pub/scm/git/git.git

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index ec6811c71885a9aa0a28626c46e0645cd79864ac..c183dc9da0392bcfbae3e1edcd4d13f89a9923c3 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -4,6 +4,15 @@
 -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.
+
+--patch-with-stat::
+       Generate patch and prepend its diffstat.
+
 -z::
        \0 line termination on output