Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
log: read gpg settings for signed commit verification
[gitweb.git]
/
unpack-trees.h
diff --git
a/unpack-trees.h
b/unpack-trees.h
index 79989483079970e9dad42512e522eef8ea2a75a4..ec74a9f19a47c39de61def9709da6d4d6f1dcbdb 100644
(file)
--- a/
unpack-trees.h
+++ b/
unpack-trees.h
@@
-52,6
+52,8
@@
struct unpack_trees_options {
const char *prefix;
int cache_bottom;
struct dir_struct *dir;
+ struct path_exclude_check *path_exclude_check;
+ struct pathspec *pathspec;
merge_fn_t fn;
const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];
/*