Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
remote.c: "git-push frotz" should update what matches at the source.
[gitweb.git]
/
unpack-trees.h
diff --git
a/unpack-trees.h
b/unpack-trees.h
index 191f7442f10683c8043288eece36f39166fedc95..fee7da43822b63e5b1f24444e5c51c43d3ff5760 100644
(file)
--- a/
unpack-trees.h
+++ b/
unpack-trees.h
@@
-16,6
+16,7
@@
struct unpack_trees_options {
int verbose_update;
int aggressive;
const char *prefix;
+ int pos;
struct dir_struct *dir;
merge_fn_t fn;