X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=unpack-trees.h;h=a2df544d040adc21f7d854ad50c53e61cf74c9ae;hb=c149184;hp=197a0044aa71fc9ca310b36b279b8382487a40a7;hpb=7cb97da17da080b88ceb0417108e6a3cb6c6299f;p=git.git

diff --git a/unpack-trees.h b/unpack-trees.h
index 197a0044a..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;