Skip to content

Instantly share code, notes, and snippets.

@esamattis

esamattis/git-embed-to-monorepo.md

Last active May 18, 2021 10:01
Show Gist options
  • Save esamattis/0180b834c16dfaf70ca9f7d9df18300b to your computer and use it in GitHub Desktop.
Save esamattis/0180b834c16dfaf70ca9f7d9df18300b to your computer and use it in GitHub Desktop.
Download ZIP
How to embed a smaller git to a subdirectory of a monorepo?
Raw
git-embed-to-monorepo.md

Embed Repository to Monorepo with History

Scenario: I have two repositories

  • monorepo
  • tool

and I want to move the tool repository into the monorepo under path packages/tool with rewritten history in a way it looks like it has been there all the time.

Install git-repo-filter: https://github.com/newren/git-filter-repo

Make fresh clone of the tool repo and run filter-repo with --to-subdirectory-filter packages/tool

git clone [email protected]:esamattis/tool.git
cd tool
git filter-repo --to-subdirectory-filter packages/tool

The history has now been moved to packages/tool. Now we just need to merge it to the monorepo.

Go to you monorepo and add the tool repo as remote

git remote add tool-remote /filesystem/path/to/tool
git fetch tool-remote

and merge it

git merge tool-remote/master --allow-unrelated-histories

Otherway Around

You can go back too.

Get fresh clone of the monorepo

git clone [email protected]:esamattis/monorepo.git tool-only
cd tool-only
git filter-repo --subdirectory-filter packages/tool
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment