Merge branch 'jc/merge-subtree'
* jc/merge-subtree:
A new merge stragety 'subtree'.
It is safe to merge this early as this is a feature that user
explicitly needs to ask for and would not trigger otherwise. A
known issue with the current implementation is that the subtree
matching heuristics is very stupid. It could run ls-tree twice
and try to count intersection.
Giving it wider audience would help it to get improved by
motivated volunteers.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
Showing
match-trees.c
0 → 100644
test-match-trees.c
0 → 100644
想要评论请 注册 或 登录