Merge branch 'al/ansi-color'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 164e2c5348cd0210a9848c7eb21947c7d0369bd4..813a7b11b99d51d3014f854770384ed4fc247c9f 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -36,6 +36,9 @@ endif::git-format-patch[]
 --patch-with-raw::
        Synonym for "-p --raw".
 
+--patience::
+       Generate a diff using the "patience diff" algorithm.
+
 --stat[=width[,name-width]]::
        Generate a diffstat.  You can override the default
        output width for 80-column terminal by "--stat=width".