RFC: migrating to git

[Max Bolingbroke]

On 25 January 2011 09:35, Lars Viklund <zao at acc.umu.se> wrote:
> A subtree seems to be a way of getting the
> contents of a branch merged at a non-root location. It might be a
> relevant read and something to evaluate.

There is also the git-subtree project
(https://github.com/apenwarr/git-subtree). They explain the difference
from the subtree merge strategy as:

"The main difference is that, besides merging
the other project as a subdirectory, you can also extract the
entire history of a subdirectory from your project and make it
into a standalone project. Unlike the subtree merge strategy
you can alternate back and forth between these
two operations. If the standalone library gets updated, you can
automatically merge the changes into your project; if you
update the library inside your project, you can "split" the
changes back out again and merge them back into the library
project."

Might be useful. A simple example of its use is shown at
http://ayende.com/Blog/archive/2011/01/10/git-subtree.aspx

Cheers,
Max