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;
19 int diff_rename_limit;
20 int merge_rename_limit;
23 struct string_list current_file_set;
24 struct string_list current_directory_set;
28 * Sets the list of user-friendly error messages to be used by the
29 * command "cmd" (either merge or checkout)
31 void set_porcelain_error_msgs(const char **msgs, const char *cmd);
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 unsigned char *head,
53 const unsigned char *merge,
55 const unsigned char **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);
62 int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);