Add 'core.ignorecase' option
[git/git.git] / unpack-trees.h
CommitLineData
16da134b
JS
1#ifndef UNPACK_TREES_H
2#define UNPACK_TREES_H
3
ca885a4f
JH
4#define MAX_UNPACK_TREES 8
5
16da134b
JS
6struct unpack_trees_options;
7
8typedef int (*merge_fn_t)(struct cache_entry **src,
34110cd4 9 struct unpack_trees_options *options);
16da134b
JS
10
11struct unpack_trees_options {
75dc6c7c
LT
12 unsigned int reset:1,
13 merge:1,
14 update:1,
15 index_only:1,
16 nontrivial_merge:1,
17 trivial_merges_only:1,
18 verbose_update:1,
19 aggressive:1,
20 skip_unmerged:1,
21 gently:1;
16da134b 22 const char *prefix;
9a4d8fdc 23 int pos;
f8a9d428 24 struct dir_struct *dir;
16da134b
JS
25 merge_fn_t fn;
26
27 int head_idx;
28 int merge_size;
29
30 struct cache_entry *df_conflict_entry;
d1f2d7e8 31 void *unpack_data;
34110cd4
LT
32
33 struct index_state *dst_index;
34 const struct index_state *src_index;
35 struct index_state result;
16da134b
JS
36};
37
933bf40a 38extern int unpack_trees(unsigned n, struct tree_desc *t,
16da134b
JS
39 struct unpack_trees_options *options);
40
34110cd4
LT
41int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
42int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
43int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
44int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);
076b0adc 45
16da134b 46#endif