Merge branch 'jc/bottomless'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 2a0275eeda19b7af50e22f0709e6a31afee10b5e..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
 
@@ -69,6 +78,10 @@
        changeset, not just the files that contain the change
        in <string>.
 
+--pickaxe-regex::
+       Make the <string> not a plain string but an extended POSIX
+       regex to match.
+
 -O<orderfile>::
        Output the patch in the order specified in the
        <orderfile>, which has one shell glob pattern per line.