X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.h;h=fee7da43822b63e5b1f24444e5c51c43d3ff5760;hb=a2f8028d3d661b314d5a784764f2f5f9e4c2dde0;hp=c4601621cd71ac6e750c90bd3ac4b426d8e12369;hpb=659db3f673fe199bad6ce9cc625d3a1b098bfbcf;p=git.git diff --git a/unpack-trees.h b/unpack-trees.h index c4601621c..fee7da438 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -16,6 +16,8 @@ struct unpack_trees_options { int verbose_update; int aggressive; const char *prefix; + int pos; + struct dir_struct *dir; merge_fn_t fn; int head_idx;