Implement automatic fast-forward merge for submodules
[git/mingw.git] / submodule.h
blobb0a571c7f0b454ab0b5d7736aa561baec467af89
1 #ifndef SUBMODULE_H
2 #define SUBMODULE_H
4 struct diff_options;
6 void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
7 void show_submodule_summary(FILE *f, const char *path,
8 unsigned char one[20], unsigned char two[20],
9 unsigned dirty_submodule,
10 const char *del, const char *add, const char *reset);
11 unsigned is_submodule_modified(const char *path, int ignore_untracked);
12 int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],
13 const unsigned char a[20], const unsigned char b[20]);
15 #endif