Merge branch 'jk/asciidoctor-section-heading-markup-fix'

diff --git a/submodule.h b/submodule.h
index 7beec4822b9a35a6286a303f6cf877be1c734568..5507c3d9a098b1da016855c1fa4233ffc6e0a8cf 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -5,6 +5,8 @@ struct diff_options;
 struct argv_array;
 
 enum {
+       RECURSE_SUBMODULES_ERROR = -3,
+       RECURSE_SUBMODULES_NONE = -2,
        RECURSE_SUBMODULES_ON_DEMAND = -1,
        RECURSE_SUBMODULES_OFF = 0,
        RECURSE_SUBMODULES_DEFAULT = 1,
@@ -19,9 +21,7 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
                const char *path);
 int submodule_config(const char *var, const char *value, void *cb);
 void gitmodules_config(void);
-int parse_submodule_config_option(const char *var, const char *value);
 void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
-int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
 void show_submodule_summary(FILE *f, const char *path,
                const char *line_prefix,
                unsigned char one[20], unsigned char two[20],