你可以尝试子树合并策略。它可以让你将回购B合并到回购A。相对于git-filter-branch的优点是它不需要你重写回购A的历史记录(破坏SHA1和)。

你可以尝试子树合并策略。它可以让你将回购B合并到回购A。相对于git-filter-branch的优点是它不需要你重写回购A的历史记录(破坏SHA1和)。

Actually, git-stitch-repo now supports branches and tags, including annotated tags (I found there was a bug which I reported, and it got fixed). What i found useful is with tags. Since tags are attached to commits, and some of the solutions (like Eric Lee's approach) fails to deal with tags. You try to create a branch off an imported tag, and it will undo any git merges/moves and sends you back like the consolidated repository being near identical to the repository that the tag came from. Also, there are issues if you use the same tag across multiple repositories that you 'merged/consolidated'. For example, if you have repo's A ad B, both having tag rel_1.0. You merge repo A and repo B into repo AB. Since rel_1.0 tags are on two different commits (one for A and one for B), which tag will be visible in AB? Either the tag from the imported repo A or from imported repo B, but not both.

git-stitch-repo helps to address that problem by creating rel_1.0-A and rel_1.0-B tags. You may not be able to checkout rel_1.0 tag and expect both, but at least you can see both, and theoretically, you can merge them into a common local branch then create a rel_1.0 tag on that merged branch (assuming you just merge and not change source code). It's better to work with branches, as you can merge like branches from each repo into local branches. (dev-a and dev-b can be merged into a local dev branch which can then be pushed to origin).

下面是我给出的一个解决方案:

First do a complete backup of your phd directory: I don't want to be held responsible for your losing years of hard work! ;-) $ cp -r phd phd-backup Move the content of phd/code to phd/code/code, and fix the history so that it looks like it has always been there (this uses git's filter-branch command): $ cd phd/code $ git filter-branch --index-filter \ 'git ls-files -s | sed "s#\t#&code/#" | GIT_INDEX_FILE=$GIT_INDEX_FILE.new \ git update-index --index-info && mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' HEAD Same for the content of phd/figures and phd/thesis (just replace code with figures and thesis).

现在你的目录结构应该是这样的:

    phd
      |_code
      |    |_.git
      |    |_code
      |         |_(your code...)
      |_figures
      |    |_.git
      |    |_figures
      |         |_(your figures...)
      |_thesis
           |_.git
           |_thesis
                |_(your thesis...)

然后在根目录中创建一个git存储库，将所有内容都拉到其中，并删除旧的存储库: $ CD博士 $ git init $ git拉码 $ rm -rf code/code $ rm -rf代码/.git $ git拉数据-允许不相关的历史 $ rm -rf figures/数字 $ rm -rf数字/.git $ git拉论文-允许不相关的历史 $ rm -rf thesis/thesis $ rm -rf thesis/.git

最后，你现在应该得到你想要的:

    phd
      |_.git
      |_code
      |    |_(your code...)
      |_figures
      |    |_(your figures...)
      |_thesis
           |_(your thesis...)

这个过程的一个优点是，它将保留不受版本控制的文件和目录。

不过，只有一个警告:如果您的代码目录已经有一个代码子目录或文件，情况可能会非常糟糕(当然，对于图表和论文也是如此)。如果是这种情况，在执行整个过程之前，只需重命名该目录或文件:

$ cd phd/code
$ git mv code code-repository-migration
$ git commit -m "preparing the code directory for migration"

当程序完成后，添加最后一步:

$ cd phd
$ git mv code/code-repository-migration code/code
$ git commit -m "final step for code directory migration"

当然，如果代码子目录或文件没有版本控制，只需使用mv而不是git mv，忘记git的提交。

借助IntelliJ IDEA Community Edition中的git集成，我手动将3个git存储库合并为一个。

Create a new repo, add a new commit to the master branch with an empty README.md file. Add three remotes for the new repo, using the name of the 3 repositories and the remote URL of them respectively. Run Git Fetch. Create a new local branch named temp based on the master branch, so we can start over without pollute the master branch. Checkout the temp branch. Select to only show commits of one remote branch(one repository). Select all the commits and right click to Cherry-Pick them. Create directory structure for this repository, then move the files into it and commit. Repeat the step 4 to 6 for the other 2 remote branch(repository). When everything is OK, merge all the changes in the temp branch into master branch.

然后添加主分支的原始远程URL并推送到它。

git-stitch-repo将在命令行中给出的git存储库上处理git-fast-export——all——date-order的输出，并创建一个适合于git-fast-import的流，该流将创建一个新的存储库，其中包含一个新的提交树中的所有提交，该提交树尊重所有源存储库的历史。