diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-14 02:14:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-14 02:14:54 +0300 |
| commit | c9c63ee558ce3399bd2016388da9676d4f5ecf55 (patch) | |
| tree | 6a799522833b916186424ff760e99818f3fe722c /submodule-config.h | |
| parent | 91f69225443b3be8d3f11c5c71795169d7d00737 (diff) | |
| parent | e8906a9019799c0761ab5447b67582ffd9bae558 (diff) | |
Merge branch 'sb/pull-rebase-submodule'
"git pull --rebase --recurse-submodules" learns to rebase the
branch in the submodules to an updated base.
* sb/pull-rebase-submodule:
builtin/fetch cleanup: always set default value for submodule recursing
pull: optionally rebase submodules (remote submodule changes only)
builtin/fetch: parse recurse-submodules-default at default options parsing
builtin/fetch: factor submodule recurse parsing out to submodule config
Diffstat (limited to 'submodule-config.h')
| -rw-r--r-- | submodule-config.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/submodule-config.h b/submodule-config.h index bc45a25e85..233bfcb7ff 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -28,6 +28,9 @@ struct repository; extern void submodule_cache_free(struct submodule_cache *cache); extern int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg); +struct option; +extern int option_fetch_parse_recurse_submodules(const struct option *opt, + const char *arg, int unset); extern int parse_update_recurse_submodules_arg(const char *opt, const char *arg); extern int parse_push_recurse_submodules_arg(const char *opt, const char *arg); extern int parse_submodule_config_option(const char *var, const char *value); |