GIT 1.6.5
[git/git.git] / merge-recursive.h
CommitLineData
e1b3a2ca
DB
1#ifndef MERGE_RECURSIVE_H
2#define MERGE_RECURSIVE_H
3
696ee23c
MV
4#include "string-list.h"
5
8a2fce18
MV
6struct merge_options {
7 const char *branch1;
8 const char *branch2;
9 unsigned subtree_merge : 1;
10 unsigned buffer_output : 1;
11 int verbosity;
12 int diff_rename_limit;
13 int merge_rename_limit;
5033639c 14 int call_depth;
c7d84924 15 struct strbuf obuf;
696ee23c
MV
16 struct string_list current_file_set;
17 struct string_list current_directory_set;
8a2fce18
MV
18};
19
20/* merge_trees() but with recursive ancestor consolidation */
21int merge_recursive(struct merge_options *o,
22 struct commit *h1,
e1b3a2ca 23 struct commit *h2,
e1b3a2ca
DB
24 struct commit_list *ancestors,
25 struct commit **result);
26
8a2fce18
MV
27/* rename-detecting three-way merge, no recursion */
28int merge_trees(struct merge_options *o,
29 struct tree *head,
e1b3a2ca
DB
30 struct tree *merge,
31 struct tree *common,
e1b3a2ca 32 struct tree **result);
e1b3a2ca 33
8a2fce18
MV
34/*
35 * "git-merge-recursive" can be fed trees; wrap them into
36 * virtual commits and call merge_recursive() proper.
37 */
38int merge_recursive_generic(struct merge_options *o,
39 const unsigned char *head,
40 const unsigned char *merge,
41 int num_ca,
42 const unsigned char **ca,
43 struct commit **result);
44
45void init_merge_options(struct merge_options *o);
46struct tree *write_tree_from_memory(struct merge_options *o);
9047ebbc 47
e1b3a2ca 48#endif