merge_file(): add comment explaining behavior wrt conflict style
[git/git.git] / merge-recursive.h
CommitLineData
e1b3a2ca
DB
1#ifndef MERGE_RECURSIVE_H
2#define MERGE_RECURSIVE_H
3
696ee23c
MV
4#include "string-list.h"
5
8a2fce18
MV
6struct merge_options {
7 const char *branch1;
8 const char *branch2;
8cc5b290 9 enum {
85e51b78 10 MERGE_RECURSIVE_NORMAL = 0,
8cc5b290
AP
11 MERGE_RECURSIVE_OURS,
12 MERGE_RECURSIVE_THEIRS,
13 } recursive_variant;
85e51b78 14 const char *subtree_shift;
8a2fce18
MV
15 unsigned buffer_output : 1;
16 int verbosity;
17 int diff_rename_limit;
18 int merge_rename_limit;
5033639c 19 int call_depth;
c7d84924 20 struct strbuf obuf;
696ee23c
MV
21 struct string_list current_file_set;
22 struct string_list current_directory_set;
8a2fce18
MV
23};
24
264b774b
MM
25/* Return a list of user-friendly error messages to be used by merge */
26struct unpack_trees_error_msgs get_porcelain_error_msgs(void);
27
8a2fce18
MV
28/* merge_trees() but with recursive ancestor consolidation */
29int merge_recursive(struct merge_options *o,
30 struct commit *h1,
e1b3a2ca 31 struct commit *h2,
e1b3a2ca
DB
32 struct commit_list *ancestors,
33 struct commit **result);
34
8a2fce18
MV
35/* rename-detecting three-way merge, no recursion */
36int merge_trees(struct merge_options *o,
37 struct tree *head,
e1b3a2ca
DB
38 struct tree *merge,
39 struct tree *common,
e1b3a2ca 40 struct tree **result);
e1b3a2ca 41
8a2fce18
MV
42/*
43 * "git-merge-recursive" can be fed trees; wrap them into
44 * virtual commits and call merge_recursive() proper.
45 */
46int merge_recursive_generic(struct merge_options *o,
47 const unsigned char *head,
48 const unsigned char *merge,
49 int num_ca,
50 const unsigned char **ca,
51 struct commit **result);
52
53void init_merge_options(struct merge_options *o);
54struct tree *write_tree_from_memory(struct merge_options *o);
9047ebbc 55
e1b3a2ca 56#endif