Andrew's git / gitweb.git /
73e4413a8072a90c1da5a466357774e4b5500a58
   1#ifndef MERGE_RECURSIVE_H
   2#define MERGE_RECURSIVE_H
   3
   4int 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
  11int 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);
  17struct commit *make_virtual_commit(struct tree *tree, const char *comment);
  18int merge_recursive_config(const char *var, const char *value, void *cb);
  19void merge_recursive_setup(int is_subtree_merge);
  20struct tree *write_tree_from_memory(void);
  21
  22extern int merge_recursive_verbosity;
  23
  24#endif