Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision e5fc9a0aea2c3c49829b5cdf499339e5c759706b authored by Junio C Hamano on 17 February 2008, 06:44:31 UTC, committed by Junio C Hamano on 17 February 2008, 08:20:38 UTC 
GIT 1.5.4.2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 965053b
Raw File
Tip revision: e5fc9a0aea2c3c49829b5cdf499339e5c759706b authored by Junio C Hamano on 17 February 2008, 06:44:31 UTC
GIT 1.5.4.2
Tip revision: e5fc9a0
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,
		int remove);

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(unsigned n, struct tree_desc *t,
		struct unpack_trees_options *options);

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

#endif
back to top