merge-recursive.c: Add more generic merge_recursive_generic()
[git/git.git] / merge-recursive.h
CommitLineData
e1b3a2ca
DB
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);
73118f89
SB
17extern 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);
9047ebbc
MV
20int merge_recursive_config(const char *var, const char *value, void *cb);
21void merge_recursive_setup(int is_subtree_merge);
e1b3a2ca
DB
22struct tree *write_tree_from_memory(void);
23
9047ebbc
MV
24extern int merge_recursive_verbosity;
25
e1b3a2ca 26#endif