Skip to content

Instantly share code, notes, and snippets.

@mstroeck
Forked from korya/Subfolder to git repo.md
Last active September 19, 2015 08:45
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mstroeck/832496557fd9604c223b to your computer and use it in GitHub Desktop.
Save mstroeck/832496557fd9604c223b to your computer and use it in GitHub Desktop.
Convert subfolder into Git submodule

Source: http://willandorla.com/will/2011/01/convert-folder-into-git-submodule/

1. Clone new repository

$ git clone --no-hardlinks original-repo copied-repo

2. Filter out the files you want to keep and remove the others

Note the -- that separates filter-branch options from revision options, and the --all to rewrite all branches and tags.

$ cd copied-repo
$ git filter-branch --subdirectory-filter sub/module/path HEAD -- --all
$ git reset --hard
$ git gc --aggressive
$ git prune
$ git remote rm origin

You can combine the last few:

git reset --hard && git gc --aggressive && git prune && git remote rm origin

3. Push the new repositories to the upstream server

$ git remote add origin git@github.com:korya/submodule-repo.git

4. Add the new repository as submodules to the original repository

$ cd original-repo
$ git rm sub/module/path
$ git commit -m "Removing the folders that are now repositories"
$ git submodule add git@github.com:korya/submodule-repo.git sub/module/path
$ git submodule init
$ git submoduel update
$ git add .gitmodules sub/module/path
$ git commit -m "Added in submodules for removed folders"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment