Merge branch 'jl/submodule-ignore-diff'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0510ac795c1d558b7f3a551ac5cc10ba1f1c8dff..cda6721013ac3f01e7a3b6a7e770266852cef131 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -829,7 +829,8 @@ diff.renames::
 diff.ignoreSubmodules::
        Sets the default value of --ignore-submodules. Note that this
        affects only 'git diff' Porcelain, and not lower level 'diff'
-       commands such as 'git diff-files'.
+       commands such as 'git diff-files'. 'git checkout' also honors
+       this setting when reporting uncommitted changes.
 
 diff.suppressBlankEmpty::
        A boolean to inhibit the standard behavior of printing a space