merge-recursive --renormalize
[git/git.git] / merge-recursive.h
... / ...
CommitLineData
1#ifndef MERGE_RECURSIVE_H
2#define MERGE_RECURSIVE_H
3
4#include "string-list.h"
5
6struct 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;
25};
26
27/* Return a list of user-friendly error messages to be used by merge */
28struct unpack_trees_error_msgs get_porcelain_error_msgs(void);
29
30/* merge_trees() but with recursive ancestor consolidation */
31int merge_recursive(struct merge_options *o,
32 struct commit *h1,
33 struct commit *h2,
34 struct commit_list *ancestors,
35 struct commit **result);
36
37/* rename-detecting three-way merge, no recursion */
38int merge_trees(struct merge_options *o,
39 struct tree *head,
40 struct tree *merge,
41 struct tree *common,
42 struct tree **result);
43
44/*
45 * "git-merge-recursive" can be fed trees; wrap them into
46 * virtual commits and call merge_recursive() proper.
47 */
48int merge_recursive_generic(struct merge_options *o,
49 const unsigned char *head,
50 const unsigned char *merge,
51 int num_ca,
52 const unsigned char **ca,
53 struct commit **result);
54
55void init_merge_options(struct merge_options *o);
56struct tree *write_tree_from_memory(struct merge_options *o);
57
58/* builtin/merge.c */
59int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
60
61#endif