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

diff --cc Documentation/git-pull.txt
Simple merge

diff --cc builtin/fetch.c
Simple merge

diff --cc builtin/pull.c
Simple merge

diff --cc submodule-config.c
Simple merge

diff --cc submodule-config.h
index bc45a25e850eb600eb9883d83d1ec1d3fc08db4a,1076a68653c13f2cd4475d0fa0b3f55ca2b7fab7..233bfcb7fff0b2dedc64fbb11d167734bf0fad7e
--- 1/submodule-config.h
--- 2/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);

diff --cc submodule.c
Simple merge

diff --cc submodule.h
Simple merge