submodule.hon commit Implement automatic fast-forward merge for submodules (68d03e4)
   1#ifndef SUBMODULE_H
   2#define SUBMODULE_H
   3
   4struct diff_options;
   5
   6void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
   7void 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);
  11unsigned is_submodule_modified(const char *path, int ignore_untracked);
  12int 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]);
  14
  15#endif