X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=c183dc9da0392bcfbae3e1edcd4d13f89a9923c3;hb=cfa24e184a67cc36f414d913cf705d31e70a7a1a;hp=2a0275eeda19b7af50e22f0709e6a31afee10b5e;hpb=4d44cb195aca5b744fd9f149af513637ff343a67;p=git.git

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 2a0275ee..c183dc9d 100644
--- 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.