Merge branch 'aw/git-p4-deletion'
[git/kirr.git] / submodule.h
blob386f410a66d9c431a61c0e26c773f1b3452f0d09
1 #ifndef SUBMODULE_H
2 #define SUBMODULE_H
4 struct diff_options;
6 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
7 const char *path);
8 void gitmodules_config();
9 int parse_submodule_config_option(const char *var, const char *value);
10 void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
11 void show_submodule_summary(FILE *f, const char *path,
12 unsigned char one[20], unsigned char two[20],
13 unsigned dirty_submodule,
14 const char *del, const char *add, const char *reset);
15 unsigned is_submodule_modified(const char *path, int ignore_untracked);
16 int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],
17 const unsigned char a[20], const unsigned char b[20]);
19 #endif