mirror of
https://github.com/git/git.git
synced 2024-11-05 08:47:56 +01:00
076b0adcf9
This will allow merge-recursive to use the read-tree functionality without exec()ing git-read-tree. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
35 lines
865 B
C
35 lines
865 B
C
#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;
|
|
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
|