Merge branch 'jk/trailers-parse' into next

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 41d1c007a4d6bf52c270f8eaf6933f72a97d1909..c98e2ce5f57c1f41ccaf90041a1a22233ae75551 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "config.h"
 #include "builtin.h"
 #include "dir.h"
 #include "parse-options.h"