thanks a lot! With the additional help of
which explains in detail how to construct the .git/info/grafts file, I
managed to glue the histories together. I followed your suggestion of
using filter-branch instead of --fast-export as described in the blog
On Thu, Jun 28, 2012 at 12:44 PM, Philip Oakley <philipoak...@iee.org> wrote:
> You can use Grafts as a method for linking between the two repos to give the
> appearance that the history is continuous [apparently it was used for adding
> the early Linux history]. This does not change any of the sha1 values so
> their use in validating the complete history won't be valid. Also
> propogating the graft list must also be managed. Think of it as a temporary
> but effective step.
> You can do a git filter-branch after the graft, but this then re-writes the
> history (sha1's) but with an active repo that can cause hassles if you don't
> synchronise the change-over date/time with everybody.
> There are a number of threads on Stackoverflow on the issue.
> ----- Original Message -----
> To: email@example.com
> Sent: Thursday, June 28, 2012 6:57 PM
> Subject: [git-users] how to merge to separate repositories.
> a few years ago, we switched from using CVS to git. Since at the time I
> didn't know about git cvsimport (I was just beginning to use git), I checked
> out the most recent version from CVS and made that the initial commit of our
> git repository. This unfortunately meant that we lost all history prior to
> the switch.
> We would now like to add that missing history into git. I converted the CVS
> to git and have two git repositories now, one that is the converted CVS, and
> one that contains all changes since then. How do I merge the two? Naively
> this shouldn't be hard, I simply would have to glue together the two
> histories, since there is no overlap. But how do I do that?
> Thanks already,
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To view this discussion on the web visit
> To post to this group, send email to firstname.lastname@example.org.
> To unsubscribe from this group, send email to
> For more options, visit this group at
> No virus found in this message.
> Checked by AVG - www.avg.com
> Version: 2012.0.2180 / Virus Database: 2437/5096 - Release Date: 06/27/12
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to email@example.com.
To unsubscribe from this group, send email to
For more options, visit this group at