Merge branch 'np/relnotes-in-subdir'

diff --git a/builtin/diff.c b/builtin/diff.c
index 89ae89cde1e6d8a0a2e02209f5396263a81bda5b..a43d3263638daf083c52f37f3bd0872327d7459b 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -13,6 +13,7 @@
 #include "revision.h"
 #include "log-tree.h"
 #include "builtin.h"
+#include "submodule.h"
 
 struct blobinfo {
        unsigned char sha1[20];
@@ -279,6 +280,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
         */
 
        prefix = setup_git_directory_gently(&nongit);
+       gitmodules_config();
        git_config(git_diff_ui_config, NULL);
 
        if (diff_use_color_default == -1)