diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:47:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:47:30 -0700 |
| commit | c28a17f270a51a4ed5e432e83c0ed962361a37c9 (patch) | |
| tree | 6b7c829a56d0e09d8f0b80adb1d035889ce14d77 /unpack-trees.h | |
| parent | deded16d151ff0f7b80ed21a518928daff09c14c (diff) | |
| parent | a0919ced8a5efe938cf97c74a0f851cbbe00aaf6 (diff) | |
| download | git-c28a17f270a51a4ed5e432e83c0ed962361a37c9.tar.gz | |
Merge branch 'jc/cache-tree'
* jc/cache-tree:
Avoid "diff-index --cached" optimization under --find-copies-harder
Optimize "diff-index --cached" using cache-tree
t4007: modernize the style
cache-tree.c::cache_tree_find(): simplify internal API
write-tree --ignore-cache-tree
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 0d26f3d73e..1e0e2325f1 100644 --- 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; |