Merge branch 'mk/maint-graph-infinity-loop'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 1fb6f2d4e92ee2f6429af20515f25a551e0f869c..39f2c5074c1ac370976bce36cbceb1a676064cfe 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -170,7 +170,8 @@ any of those replacements occurred.
        the commits in the range like linkgit:git-submodule[1] `summary` does.
        Omitting the `--submodule` option or specifying `--submodule=short`,
        uses the 'short' format. This format just shows the names of the commits
-       at the beginning and end of the range.
+       at the beginning and end of the range.  Can be tweaked via the
+       `diff.submodule` configuration variable.
 
 --color[=<when>]::
        Show colored diff.