Skip to main content

Browse the archive

Staging
v0.5.2
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision bbff2dce2baf840cca6ddfd79be3c27f93322f47 authored by Junio C Hamano on 27 December 2007, 02:16:52 UTC, committed by Junio C Hamano on 27 December 2007, 02:16:52 UTC 
GIT 1.5.4-rc2
 
Although everybody was quiet during the Christmas holiday, it's been
a week since -rc1, so here is -rc2.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 49e6be5
Raw File
Tip revision: bbff2dce2baf840cca6ddfd79be3c27f93322f47 authored by Junio C Hamano on 27 December 2007, 02:16:52 UTC
GIT 1.5.4-rc2
Tip revision: bbff2dc
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