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: output at end, 2: keep buffered */
17 unsigned renormalize : 1;
21 int diff_rename_limit;
22 int merge_rename_limit;
24 int needed_rename_limit;
25 int show_rename_progress;
28 struct string_list current_file_set;
29 struct string_list current_directory_set;
30 struct string_list df_conflict_file_set;
33 /* merge_trees() but with recursive ancestor consolidation */
34 int merge_recursive(struct merge_options *o,
37 struct commit_list *ancestors,
38 struct commit **result);
40 /* rename-detecting three-way merge, no recursion */
41 int merge_trees(struct merge_options *o,
45 struct tree **result);
48 * "git-merge-recursive" can be fed trees; wrap them into
49 * virtual commits and call merge_recursive() proper.
51 int merge_recursive_generic(struct merge_options *o,
52 const struct object_id *head,
53 const struct object_id *merge,
55 const struct object_id **ca,
56 struct commit **result);
58 void init_merge_options(struct merge_options *o);
59 struct tree *write_tree_from_memory(struct merge_options *o);
61 int parse_merge_opt(struct merge_options *out, const char *s);