1 #ifndef MERGE_RECURSIVE_H
2 #define MERGE_RECURSIVE_H
4 #include "string-list.h"
11 MERGE_RECURSIVE_NORMAL = 0,
13 MERGE_RECURSIVE_THEIRS
15 const char *subtree_shift;
16 unsigned buffer_output : 1;
17 unsigned renormalize : 1;
20 int diff_rename_limit;
21 int merge_rename_limit;
23 int needed_rename_limit;
26 struct string_list current_file_set;
27 struct string_list current_directory_set;
30 /* merge_trees() but with recursive ancestor consolidation */
31 int merge_recursive(struct merge_options *o,
34 struct commit_list *ancestors,
35 struct commit **result);
37 /* rename-detecting three-way merge, no recursion */
38 int merge_trees(struct merge_options *o,
42 struct tree **result);
45 * "git-merge-recursive" can be fed trees; wrap them into
46 * virtual commits and call merge_recursive() proper.
48 int merge_recursive_generic(struct merge_options *o,
49 const unsigned char *head,
50 const unsigned char *merge,
52 const unsigned char **ca,
53 struct commit **result);
55 void init_merge_options(struct merge_options *o);
56 struct tree *write_tree_from_memory(struct merge_options *o);
58 int parse_merge_opt(struct merge_options *out, const char *s);
61 int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);