summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-31 22:38:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-31 22:38:52 (GMT)
commit5a4f07b32207044eb8380f2893f807cc8ab9d58f (patch)
tree8860227eb2821a6e7d6d490cb31a4b32a28227ff /builtin/checkout.c
parentfc9dfda1be25ab3bb311900c6cfbf59d6b6e224e (diff)
parent027771fcb153e0003bcb2d68e1838594a48b0161 (diff)
downloadgit-5a4f07b32207044eb8380f2893f807cc8ab9d58f.zip
git-5a4f07b32207044eb8380f2893f807cc8ab9d58f.tar.gz
git-5a4f07b32207044eb8380f2893f807cc8ab9d58f.tar.bz2
Merge branch 'hv/submodule-config'
The gitmodules API accessed from the C code learned to cache stuff lazily. * hv/submodule-config: submodule: allow erroneous values for the fetchRecurseSubmodules option submodule: use new config API for worktree configurations submodule: extract functions for config set and lookup submodule: implement a config API for lookup of .gitmodules values
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 52d59eb..bc703c0 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -18,6 +18,7 @@
#include "xdiff-interface.h"
#include "ll-merge.h"
#include "resolve-undo.h"
+#include "submodule-config.h"
#include "submodule.h"
static const char * const checkout_usage[] = {