Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 49 lines (41 sloc) 1.25 kb
e1b3a2c Build-in merge-recursive
Daniel Barkalow authored
1 #ifndef MERGE_RECURSIVE_H
2 #define MERGE_RECURSIVE_H
3
696ee23 merge-recursive: move current_{file,directory}_set to struct merge_optio...
Miklos Vajna authored
4 #include "string-list.h"
5
8a2fce1 merge-recursive: introduce merge_options
Miklos Vajna authored
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;
5033639 merge-recursive: move call_depth to struct merge_options
Miklos Vajna authored
14 int call_depth;
c7d8492 merge-recursive: move the global obuf to struct merge_options
Miklos Vajna authored
15 struct strbuf obuf;
696ee23 merge-recursive: move current_{file,directory}_set to struct merge_optio...
Miklos Vajna authored
16 struct string_list current_file_set;
17 struct string_list current_directory_set;
8a2fce1 merge-recursive: introduce merge_options
Miklos Vajna authored
18 };
19
20 /* merge_trees() but with recursive ancestor consolidation */
21 int merge_recursive(struct merge_options *o,
22 struct commit *h1,
e1b3a2c Build-in merge-recursive
Daniel Barkalow authored
23 struct commit *h2,
24 struct commit_list *ancestors,
25 struct commit **result);
26
8a2fce1 merge-recursive: introduce merge_options
Miklos Vajna authored
27 /* rename-detecting three-way merge, no recursion */
28 int merge_trees(struct merge_options *o,
29 struct tree *head,
e1b3a2c Build-in merge-recursive
Daniel Barkalow authored
30 struct tree *merge,
31 struct tree *common,
32 struct tree **result);
33
8a2fce1 merge-recursive: introduce merge_options
Miklos Vajna authored
34 /*
35 * "git-merge-recursive" can be fed trees; wrap them into
36 * virtual commits and call merge_recursive() proper.
37 */
38 int merge_recursive_generic(struct merge_options *o,
39 const unsigned char *head,
40 const unsigned char *merge,
41 int num_ca,
42 const unsigned char **ca,
43 struct commit **result);
44
45 void init_merge_options(struct merge_options *o);
46 struct tree *write_tree_from_memory(struct merge_options *o);
9047ebb Split out merge_recursive() to merge-recursive.c
Miklos Vajna authored
47
e1b3a2c Build-in merge-recursive
Daniel Barkalow authored
48 #endif
Something went wrong with that request. Please try again.