aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.h
diff options
context:
space:
mode:
Diffstat (limited to 'unpack-trees.h')
-rw-r--r--unpack-trees.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index 95ff36c82..ef70eab39 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -31,10 +31,11 @@ struct unpack_trees_options {
skip_unmerged,
initial_checkout,
diff_index_cached,
+ debug_unpack,
skip_sparse_checkout,
gently;
const char *prefix;
- int pos;
+ int cache_bottom;
struct dir_struct *dir;
merge_fn_t fn;
struct unpack_trees_error_msgs msgs;