Merge branch 'pb/regex' into next

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 2a0275eeda19b7af50e22f0709e6a31afee10b5e..ec6811c71885a9aa0a28626c46e0645cd79864ac 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -69,6 +69,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.