How to add one git story to another?

Question

I have a repository containing code for an old version of a website that is no longer used in master . The site was completely redesigned in the new repository, and the code and history from this repository were copied to a branch in the repo of the old site, call it new_site . I cannot combine new_site into master , as the stories are completely different.

I studied both submodules and subtrees, a little reconciled, but both of them seem relevant only when you are trying to save code from one project contained in a subdirectory of another project, and not when you want to insert two working trees on top of each other.

At this point, I would like the old code to stay where it is, and just add new_site on top of the current HEAD. Any idea how I can do this, or alternative suggestions for cleaning up this mess without blowing away the old code?

Answer 1

General idea:

• explained in How to combine two separate unrelated Git repositories into one with the same history timeline "(fetch + cherry pick)

• implemented in Combine the history of two Git repositories?

   git clone <git repository B url> cd <git repository B directory> git remote add repo-A-branch <git repository A directory> git fetch repo-A-branch master git remote rm repo-A-branch 

After you have imported the correct branch from A, you can use the graft point and then git filter-branch to include the graft history in the “true” story to get rid of the graft point.