From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Jul 2017 23:14:54 +0000 (-0700)
Subject: Merge branch 'sb/pull-rebase-submodule'
X-Git-Tag: v2.14.0-rc0~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c9c63ee558ce3399bd2016388da9676d4f5ecf55

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
---

c9c63ee558ce3399bd2016388da9676d4f5ecf55
diff --cc submodule-config.h
index bc45a25e85,1076a68653..233bfcb7ff
--- a/submodule-config.h
+++ b/submodule-config.h
@@@ -22,12 -22,10 +22,15 @@@ struct submodule 
  	int recommend_shallow;
  };
  
 +struct submodule_cache;
 +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);