X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.h;h=a2df544d040adc21f7d854ad50c53e61cf74c9ae;hb=c149184;hp=5517faafad6ca3f327c81ab6e8e5f2701ff0ad14;hpb=144126abf99f2eac48e63b7ea85a8f3f99f814db;p=git.git

diff --git a/unpack-trees.h b/unpack-trees.h
index 5517faafa..a2df544d0 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -16,6 +16,8 @@ struct unpack_trees_options {
 	int trivial_merges_only;
 	int verbose_update;
 	int aggressive;
+	int skip_unmerged;
+	int gently;
 	const char *prefix;
 	int pos;
 	struct dir_struct *dir;
@@ -25,6 +27,7 @@ struct unpack_trees_options {
 	int merge_size;
 
 	struct cache_entry *df_conflict_entry;
+	void *unpack_data;
 };
 
 extern int unpack_trees(unsigned n, struct tree_desc *t,