![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 9 Apr 2007 06:51:14 +0000 (23:51 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 9 Apr 2007 06:54:17 +0000 (23:54 -0700) | ||
| commit | 58fe516bb51f09f372e7442933161c10b7ccddd8 | |
| tree | 074fd4a13ccb66298f1b5000859d7104110de409 | tree | snapshot |
| parent | 27be481ffbbde9499b4203d26680cf21b4a7ec29 | commit | diff |
| parent | 68faf68938ee943fc251c702f2027e4dfda354db | commit | diff |
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: Junio C Hamano <junkio@cox.net>
* 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: Junio C Hamano <junkio@cox.net>