summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-20 21:47:30 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-20 21:47:30 -0700
commitc28a17f270a51a4ed5e432e83c0ed962361a37c9 (patch)
tree6b7c829a56d0e09d8f0b80adb1d035889ce14d77 /merge-recursive.c
parentdeded16d151ff0f7b80ed21a518928daff09c14c (diff)
parenta0919ced8a5efe938cf97c74a0f851cbbe00aaf6 (diff)
downloadgit-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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions