[thirdparty/git.git] / unpack-trees.h

#ifndef UNPACK_TREES_H
#define UNPACK_TREES_H

struct unpack_trees_options;

typedef int (*merge_fn_t)(struct cache_entry **src,
		struct unpack_trees_options *options);

struct unpack_trees_options {
	int reset;
	int merge;
	int update;
	int index_only;
	int nontrivial_merge;
	int trivial_merges_only;
	int verbose_update;
	int aggressive;
	const char *prefix;
	int pos;
	struct dir_struct *dir;
	merge_fn_t fn;

	int head_idx;
	int merge_size;

	struct cache_entry *df_conflict_entry;
};

extern int unpack_trees(struct object_list *trees,
		struct unpack_trees_options *options);

int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);

#endif
Commit	Line	Data
16da134b JS	1	#ifndef UNPACK_TREES_H
	2	#define UNPACK_TREES_H
	3
	4	struct unpack_trees_options;
	5
	6	typedef int (merge_fn_t)(struct cache_entry *src,
	7	struct unpack_trees_options *options);
	8
	9	struct unpack_trees_options {
	10	int reset;
	11	int merge;
	12	int update;
	13	int index_only;
	14	int nontrivial_merge;
	15	int trivial_merges_only;
	16	int verbose_update;
	17	int aggressive;
	18	const char *prefix;
9a4d8fdc	19	int pos;
f8a9d428	20	struct dir_struct *dir;
16da134b JS	21	merge_fn_t fn;
	22
	23	int head_idx;
	24	int merge_size;
	25
	26	struct cache_entry *df_conflict_entry;
	27	};
	28
	29	extern int unpack_trees(struct object_list *trees,
	30	struct unpack_trees_options *options);
	31
076b0adc JS	32	int threeway_merge(struct cache_entry *stages, struct unpack_trees_options o);
	33	int twoway_merge(struct cache_entry *src, struct unpack_trees_options o);
	34	int bind_merge(struct cache_entry *src, struct unpack_trees_options o);
	35	int oneway_merge(struct cache_entry *src, struct unpack_trees_options o);
	36
16da134b	37	#endif