2008-02-07 17:40:05 +01:00
|
|
|
#ifndef MERGE_RECURSIVE_H
|
|
|
|
#define MERGE_RECURSIVE_H
|
|
|
|
|
|
|
|
int merge_recursive(struct commit *h1,
|
|
|
|
struct commit *h2,
|
|
|
|
const char *branch1,
|
|
|
|
const char *branch2,
|
|
|
|
struct commit_list *ancestors,
|
|
|
|
struct commit **result);
|
|
|
|
|
|
|
|
int merge_trees(struct tree *head,
|
|
|
|
struct tree *merge,
|
|
|
|
struct tree *common,
|
|
|
|
const char *branch1,
|
|
|
|
const char *branch2,
|
|
|
|
struct tree **result);
|
2008-08-12 22:13:59 +02:00
|
|
|
extern int merge_recursive_generic(const char **base_list,
|
|
|
|
const unsigned char *head_sha1, const char *head_name,
|
|
|
|
const unsigned char *next_sha1, const char *next_name);
|
2008-08-12 18:45:14 +02:00
|
|
|
int merge_recursive_config(const char *var, const char *value, void *cb);
|
|
|
|
void merge_recursive_setup(int is_subtree_merge);
|
2008-02-07 17:40:05 +01:00
|
|
|
struct tree *write_tree_from_memory(void);
|
|
|
|
|
2008-08-12 18:45:14 +02:00
|
|
|
extern int merge_recursive_verbosity;
|
|
|
|
|
2008-02-07 17:40:05 +01:00
|
|
|
#endif
|