diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/checkout.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index e73bfe340..829442932 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -608,6 +608,10 @@ static int git_checkout_config(const char *var, const char *value, void *cb) handle_ignore_submodules_arg(&opts->diff_options, value); return 0; } + + if (!prefixcmp(var, "submodule.")) + return parse_submodule_config_option(var, value); + return git_xmerge_config(var, value, NULL); } @@ -689,6 +693,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) memset(&opts, 0, sizeof(opts)); memset(&new, 0, sizeof(new)); + gitmodules_config(); git_config(git_checkout_config, &opts); opts.track = BRANCH_TRACK_UNSPECIFIED; |