Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
gitweb: Add a feature to show side-by-side diff
[gitweb.git]
/
unpack-trees.h
diff --git
a/unpack-trees.h
b/unpack-trees.h
index 79989483079970e9dad42512e522eef8ea2a75a4..5e432f576eb2304a63510a61a71182e11f777092 100644
(file)
--- 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];
/*