Bureaucrats, confirmed, Administrators
4,558
edits
Changes
Jump to navigation
Jump to search
* The [http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html subtree merge strategy page on kernel.org] shows you how to do this.== Submodules ==* https://westmarch.j5int.com/2014/06/splicing-git-repositories-together/ [https://github.com/j5int/jbosstools-gitmigration/blob/master/git_fast_filter/testcases/splice_repos.py Splice Repos] Sometimes, 'combining' your work with other work is a python script. Itbest accomplished through ''s more recent than some others and a better tool because it's based on fast-export/fast-import <ref>[https://git-scm.com/docsbook/en/v2/gitGit-fastTools-import</ref>Submodules submodules]'''. It grew out Git submodules are a way for you to store other repositories in directories of the [https://githubyour project.com/j5int/jbosstools-gitmigration JBossTools git migration] (which itself has some useful info on procedures) This is most often used to handle 'vendor' code, or libraries. However, submodules can be used whenever you want to combine repositories, yet maintain them independently.
adds reference to submodules, link to reposurgeon
* This one, [https://github.com/robinst/git-merge-repos git-merge-repos] is interesting because it talks about taking multiple repositories with more or less the same branches or tags, and merging them at the tag
* [https://stackoverflow.com/questions/277029/combining-multiple-git-repositories This post on Stackoverflow about combining multiple git repositories] mentions git-stitch-repo, and also how it gained the capability to work with non-linear merge histories. It also explains how to do repo merges with git-filter-branch. Note that git-filter-branch requires you to rewrite your history (breaking SHA1 sums).
* The [http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html subtree merge strategy page on kernel.org] shows you how to do this.
* https://westmarch.j5int.com/2014/06/splicing-git-repositories-together/ [https://github.com/j5int/jbosstools-gitmigration/blob/master/git_fast_filter/testcases/splice_repos.py Splice Repos] is a python script. It's more recent than some others and a better tool because it's based on fast-export/fast-import <ref>https://git-scm.com/docs/git-fast-import</ref>. It grew out of the [https://github.com/j5int/jbosstools-gitmigration JBossTools git migration] (which itself has some useful info on procedures).
* Also, the [[reposurgeon]] tool itself can assist you with the re-organization of your sources.
{{References}}
