X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.h;h=d19df44f4070ca1bda29382e56fbced53aacd994;hb=410e99fadf25b65b70d9bf90fd8bd5a5d1ea3c8a;hp=0d26f3d73e773230972db86f34a5147ada881e8b;hpb=7d4e3a72fb2d544b4a7cfd75f8626532d78fd726;p=git.git

diff --git a/unpack-trees.h b/unpack-trees.h
index 0d26f3d73..d19df44f4 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -17,17 +17,18 @@ struct unpack_trees_error_msgs {
 };
 
 struct unpack_trees_options {
-	unsigned int reset:1,
-		     merge:1,
-		     update:1,
-		     index_only:1,
-		     nontrivial_merge:1,
-		     trivial_merges_only:1,
-		     verbose_update:1,
-		     aggressive:1,
-		     skip_unmerged:1,
-		     initial_checkout:1,
-		     gently:1;
+	unsigned int reset,
+		     merge,
+		     update,
+		     index_only,
+		     nontrivial_merge,
+		     trivial_merges_only,
+		     verbose_update,
+		     aggressive,
+		     skip_unmerged,
+		     initial_checkout,
+		     diff_index_cached,
+		     gently;
 	const char *prefix;
 	int pos;
 	struct dir_struct *dir;