Import git subfolder into another repository with history (2022)

import-git-subfolder.md

1. Install git-filter-repo

brew install git-filter-repo
# or just download the single python file

2. Clone fresh copy of both of your repo (in case you mess up)

git clone [email protected]:YOUR_ORGANIZATION/repo1.git tmprepo1
git clone [email protected]:YOUR_ORGANIZATION/repo2.git tmprepo2

3. Rewrite the history on the local copy of the first repo to only include the subfolder you want

The single quotes are unnecessary, but make it clearer to a human that we are replacing the empty string as a prefix with my-module-

cd tmprepo1/
git filter-repo --path subfolder --tag-rename '':'subfolder-prefix-'
# or
git filter-repo --path subfolder --to-subdirectory-filter move-to-this-folder --tag-rename '':'subfolder-prefix-'

4. Import the branch with rewritten history into a new branch in destination repository

cd tmprepo2
git remote add tmpremote $HOME/workspace/tmprepo1
git fetch tmpremote
git checkout -b imported-branch tmpremote/main

5. Rebase on main branch, cleanup temporary remote, and push imported branch to destination remote

git rebase main
git remote remove tmpremote
git push -u origin imported-branch

Links

• https://github.com/newren/git-filter-repo#simple-example-with-comparisons
• https://gist.github.com/davidonlaptop/68bcabb20e384207a58a885fddd086e5