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