From: Junio C Hamano <junkio@cox.net>
Date: Mon, 9 Apr 2007 06:51:14 +0000 (-0700)
Subject: Merge branch 'jc/merge-subtree'
X-Git-Tag: v1.5.2-rc0~69
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=58fe516bb51f09f372e7442933161c10b7ccddd8;p=git.git

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>
---

58fe516bb51f09f372e7442933161c10b7ccddd8