Submodules: Use "ignore" settings from .gitmodules too for diff and status

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 9cf7506626e5ba66116f23c69627a7de36ad515f..faa467b03297fa61584a6a75745e3fe1b78c8e21 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -334,7 +334,7 @@ endif::git-format-patch[]
        Using "none" will consider the submodule modified when it either contains
        untracked or modified files or its HEAD differs from the commit recorded
        in the superproject and can be used to override any settings of the
-       'ignore' option in linkgit:git-config[1]. When
+       'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When
        "untracked" is used submodules are not considered dirty when they only
        contain untracked content (but they are still scanned for modified
        content). Using "dirty" ignores all changes to the work tree of submodules,