X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.h;h=5e432f576eb2304a63510a61a71182e11f777092;hb=bd193f46b70fd3f8a55e2a8dcbb1fb2b4eec13d6;hp=79989483079970e9dad42512e522eef8ea2a75a4;hpb=1f7a2abcc18ec1080905dc5cd59381f7ac1c8111;p=git.git diff --git a/unpack-trees.h b/unpack-trees.h index 799894830..5e432f576 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -52,6 +52,7 @@ struct unpack_trees_options { const char *prefix; int cache_bottom; struct dir_struct *dir; + struct pathspec *pathspec; merge_fn_t fn; const char *msgs[NB_UNPACK_TREES_ERROR_TYPES]; /*