Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 4a6cc6f490f4e7b8a98adb362213535b6a9ae97d..e4cf1b5bb25e14b54e29d0b467e94a374ec9c9d5 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "config.h"
 #include "commit.h"
 #include "refs.h"
 #include "builtin.h"