summaryrefslogtreecommitdiff
path: root/Documentation/config/diff.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/config/diff.txt')
-rw-r--r--Documentation/config/diff.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt
index c3ae136eba..2d3331f55c 100644
--- a/Documentation/config/diff.txt
+++ b/Documentation/config/diff.txt
@@ -85,6 +85,8 @@ diff.ignoreSubmodules::
and 'git status' when `status.submoduleSummary` is set unless it is
overridden by using the --ignore-submodules command-line option.
The 'git submodule' commands are not affected by this setting.
+ By default this is set to untracked so that any untracked
+ submodules are ignored.
diff.mnemonicPrefix::
If set, 'git diff' uses a prefix pair that is different from the