Merge branch 'sb/pull-rebase-submodule'

diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index c97069a714e42a1737b5dfa223fe39c26ad9aa67..17bf84d18f802d3f223e7408fee644b94878b35f 100644 (file)
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -4,6 +4,7 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
+#include "config.h"
 #include "diff.h"
 #include "commit.h"
 #include "revision.h"