Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t6010-merge-base.sh: Depict the octopus test graph
[gitweb.git]
/
unpack-trees.h
diff --git
a/unpack-trees.h
b/unpack-trees.h
index 0d26f3d73e773230972db86f34a5147ada881e8b..1e0e2325f150e943dd22b16c1392c136570732bc 100644
(file)
--- a/
unpack-trees.h
+++ b/
unpack-trees.h
@@
-27,6
+27,7
@@
struct unpack_trees_options {
aggressive:1,
skip_unmerged:1,
initial_checkout:1,
+ diff_index_cached:1,
gently:1;
const char *prefix;
int pos;