Merge branch 'pw/p4-update'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 1ce4ae3b17a7bca7082e499bf7edbc80359c2e79..08b581f040859d39aeaad8294bc7a3e7760ab0b9 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -45,6 +45,10 @@ ifndef::git-format-patch[]
        Synonym for `-p --raw`.
 endif::git-format-patch[]
 
+--minimal::
+       Spend extra time to make sure the smallest possible
+       diff is produced.
+
 --patience::
        Generate a diff using the "patience diff" algorithm.