diff options
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 5517faafad..a2df544d04 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, |