Merge branch 'jk/gpg-interface-cleanup'

diff --git a/submodule-config.h b/submodule-config.h
index 092ebfc931a82774928b6ac43a249b524c770f79..b1fdcc0c33326f556d23ce65ad21b01514fcb927 100644 (file)
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -18,9 +18,11 @@ struct submodule {
        struct submodule_update_strategy update_strategy;
        /* the sha1 blob id of the responsible .gitmodules file */
        unsigned char gitmodules_sha1[20];
+       int recommend_shallow;
 };
 
 int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
+int parse_push_recurse_submodules_arg(const char *opt, const char *arg);
 int parse_submodule_config_option(const char *var, const char *value);
 const struct submodule *submodule_from_name(const unsigned char *commit_sha1,
                const char *name);