Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
[git/jnareb-git.git] / merge-recursive.h
blob34492dbd6ea22d715c98acbeeabe04033ff9a794
1 #ifndef MERGE_RECURSIVE_H
2 #define MERGE_RECURSIVE_H
4 #include "string-list.h"
6 struct merge_options {
7 const char *ancestor;
8 const char *branch1;
9 const char *branch2;
10 enum {
11 MERGE_RECURSIVE_NORMAL = 0,
12 MERGE_RECURSIVE_OURS,
13 MERGE_RECURSIVE_THEIRS
14 } recursive_variant;
15 const char *subtree_shift;
16 unsigned buffer_output : 1;
17 unsigned renormalize : 1;
18 int verbosity;
19 int diff_rename_limit;
20 int merge_rename_limit;
21 int call_depth;
22 struct strbuf obuf;
23 struct string_list current_file_set;
24 struct string_list current_directory_set;
27 /* merge_trees() but with recursive ancestor consolidation */
28 int merge_recursive(struct merge_options *o,
29 struct commit *h1,
30 struct commit *h2,
31 struct commit_list *ancestors,
32 struct commit **result);
34 /* rename-detecting three-way merge, no recursion */
35 int merge_trees(struct merge_options *o,
36 struct tree *head,
37 struct tree *merge,
38 struct tree *common,
39 struct tree **result);
42 * "git-merge-recursive" can be fed trees; wrap them into
43 * virtual commits and call merge_recursive() proper.
45 int merge_recursive_generic(struct merge_options *o,
46 const unsigned char *head,
47 const unsigned char *merge,
48 int num_ca,
49 const unsigned char **ca,
50 struct commit **result);
52 void init_merge_options(struct merge_options *o);
53 struct tree *write_tree_from_memory(struct merge_options *o);
55 /* builtin/merge.c */
56 int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
58 #endif