config: Introduce diff.algorithm variable

diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 4314ad0fbb617b9f4c9c4e3d45f5d08f89259e2b..b8a8724f6f87fdc820f0d686078e0466adbad204 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -155,3 +155,20 @@ diff.tool::
        "kompare".  Any other value is treated as a custom diff tool,
        and there must be a corresponding `difftool.<tool>.cmd`
        option.
+
+diff.algorithm::
+       Choose a diff algorithm.  The variants are as follows:
++
+--
+`default`, `myers`;;
+       The basic greedy diff algorithm. Currently, this is the default.
+`minimal`;;
+       Spend extra time to make sure the smallest possible diff is
+       produced.
+`patience`;;
+       Use "patience diff" algorithm when generating patches.
+`histogram`;;
+       This algorithm extends the patience algorithm to "support
+       low-occurrence common elements".
+--
++