diff options
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h index dbda270873..386f410a66 100644 --- a/submodule.h +++ b/submodule.h @@ -1,10 +1,19 @@ #ifndef SUBMODULE_H #define SUBMODULE_H +struct diff_options; + +void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt, + const char *path); +void gitmodules_config(); +int parse_submodule_config_option(const char *var, const char *value); +void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *); void show_submodule_summary(FILE *f, const char *path, unsigned char one[20], unsigned char two[20], unsigned dirty_submodule, const char *del, const char *add, const char *reset); unsigned is_submodule_modified(const char *path, int ignore_untracked); +int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20], + const unsigned char a[20], const unsigned char b[20]); #endif |