git.oblomov.eu Git - git/blob - merge-recursive.h

   1 #ifndef MERGE_RECURSIVE_H
   2 #define MERGE_RECURSIVE_H
   3
   4 int merge_recursive(struct commit *h1,
   5                     struct commit *h2,
   6                     const char *branch1,
   7                     const char *branch2,
   8                     struct commit_list *ancestors,
   9                     struct commit **result);
  10
  11 int merge_trees(struct tree *head,
  12                 struct tree *merge,
  13                 struct tree *common,
  14                 const char *branch1,
  15                 const char *branch2,
  16                 struct tree **result);
  17 extern int merge_recursive_generic(const char **base_list,
  18                 const unsigned char *head_sha1, const char *head_name,
  19                 const unsigned char *next_sha1, const char *next_name);
  20 int merge_recursive_config(const char *var, const char *value, void *cb);
  21 void merge_recursive_setup(int is_subtree_merge);
  22 struct tree *write_tree_from_memory(void);
  23
  24 extern int merge_recursive_verbosity;
  25
  26 #endif