builtin-commit: add --date option
[git/vmiklos.git] / merge-recursive.h
blobd8bc7299ee3a70484b2436afd3799fe6f7608422
1 #ifndef MERGE_RECURSIVE_H
2 #define MERGE_RECURSIVE_H
4 #include "string-list.h"
6 struct merge_options {
7 const char *branch1;
8 const char *branch2;
9 unsigned subtree_merge : 1;
10 unsigned buffer_output : 1;
11 int verbosity;
12 int diff_rename_limit;
13 int merge_rename_limit;
14 int call_depth;
15 struct strbuf obuf;
16 struct string_list current_file_set;
17 struct string_list current_directory_set;
20 /* Return a list of user-friendly error messages to be used by merge */
21 struct unpack_trees_error_msgs get_porcelain_error_msgs(void);
23 /* merge_trees() but with recursive ancestor consolidation */
24 int merge_recursive(struct merge_options *o,
25 struct commit *h1,
26 struct commit *h2,
27 struct commit_list *ancestors,
28 struct commit **result);
30 /* rename-detecting three-way merge, no recursion */
31 int merge_trees(struct merge_options *o,
32 struct tree *head,
33 struct tree *merge,
34 struct tree *common,
35 struct tree **result);
38 * "git-merge-recursive" can be fed trees; wrap them into
39 * virtual commits and call merge_recursive() proper.
41 int merge_recursive_generic(struct merge_options *o,
42 const unsigned char *head,
43 const unsigned char *merge,
44 int num_ca,
45 const unsigned char **ca,
46 struct commit **result);
48 void init_merge_options(struct merge_options *o);
49 struct tree *write_tree_from_memory(struct merge_options *o);
51 #endif