4e7c4571b8
This option allows the caller to reset everything that isn't unmerged, leaving the unmerged things to be resolved. If, after a merge of "working" and "HEAD", this is used with "HEAD" (reset, !update), the result will be that all of the changes from "local" are in the working tree but not added to the index (either with the index clean but unchanged, or with the index unmerged, depending on whether there are conflicts). This will be used in checkout -m. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
42 lines
993 B
C
42 lines
993 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,
|
|
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;
|
|
int skip_unmerged;
|
|
int gently;
|
|
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;
|
|
void *unpack_data;
|
|
};
|
|
|
|
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
|