这是一种不重写任何历史记录的方法，因此所有提交id都将保持有效。最终结果是第二个repo的文件将在子目录中结束。

Add the second repo as a remote: cd firstgitrepo/ git remote add secondrepo username@servername:andsoon Make sure that you've downloaded all of the secondrepo's commits: git fetch secondrepo Create a local branch from the second repo's branch: git branch branchfromsecondrepo secondrepo/master Move all its files into a subdirectory: git checkout branchfromsecondrepo mkdir subdir/ git ls-tree -z --name-only HEAD | xargs -0 -I {} git mv {} subdir/ git commit -m "Moved files to subdir/" Merge the second branch into the first repo's master branch: git checkout master git merge --allow-unrelated-histories branchfromsecondrepo

您的存储库将有多个根提交，但这不会造成问题。

我根据x-yuri的答案创建了一个库，其中使用了filter-repo。使用我的脚本，您可以轻松地将所有分支和标记移动到新的存储库中，而不会因为指定不同的子dirs而发生合并冲突。

这是一种不重写任何历史记录的方法，因此所有提交id都将保持有效。最终结果是第二个repo的文件将在子目录中结束。

Add the second repo as a remote: cd firstgitrepo/ git remote add secondrepo username@servername:andsoon Make sure that you've downloaded all of the secondrepo's commits: git fetch secondrepo Create a local branch from the second repo's branch: git branch branchfromsecondrepo secondrepo/master Move all its files into a subdirectory: git checkout branchfromsecondrepo mkdir subdir/ git ls-tree -z --name-only HEAD | xargs -0 -I {} git mv {} subdir/ git commit -m "Moved files to subdir/" Merge the second branch into the first repo's master branch: git checkout master git merge --allow-unrelated-histories branchfromsecondrepo

您的存储库将有多个根提交，但这不会造成问题。

It turns out that the answer is much simpler if you're simply trying to glue two repositories together and make it look like it was that way all along rather than manage an external dependency. You simply need to add remotes to your old repos, merge them to your new master, move the files and folders to a subdirectory, commit the move, and repeat for all additional repos. Submodules, subtree merges, and fancy rebases are intended to solve a slightly different problem and aren't suitable for what I was trying to do.

下面是一个示例Powershell脚本，将两个存储库粘合在一起:

# Assume the current directory is where we want the new repository to be created
# Create the new repository
git init

# Before we do a merge, we have to have an initial commit, so we'll make a dummy commit
git commit --allow-empty -m "Initial dummy commit"

# Add a remote for and fetch the old repo
# (the '--fetch' (or '-f') option will make git immediately fetch commits to the local repo after adding the remote)
git remote add --fetch old_a <OldA repo URL>

# Merge the files from old_a/master into new/master
git merge old_a/master --allow-unrelated-histories

# Move the old_a repo files and folders into a subdirectory so they don't collide with the other repo coming later
mkdir old_a
dir -exclude old_a | %{git mv $_.Name old_a}

# Commit the move
git commit -m "Move old_a files into subdir"

# Do the same thing for old_b
git remote add -f old_b <OldB repo URL>
git merge old_b/master --allow-unrelated-histories
mkdir old_b
dir –exclude old_a,old_b | %{git mv $_.Name old_b}
git commit -m "Move old_b files into subdir"

显然，如果您愿意，您可以将old_b合并到old_a(这将成为新的合并回购)—修改脚本以适应。

如果你也想引入正在进行的特性分支，使用这个:

# Bring over a feature branch from one of the old repos
git checkout -b feature-in-progress
git merge -s recursive -Xsubtree=old_a old_a/feature-in-progress

这是该过程中唯一不明显的部分——这不是子树合并，而是普通递归合并的参数，它告诉Git我们重命名了目标，并帮助Git正确地排列所有内容。

我在这里写了一个更详细的解释。

假设你想要合并存储库a到b(我假设它们位于彼此旁边):

cd b
git remote add a ../a
git fetch a
git merge --allow-unrelated-histories a/master
git remote remove a

如果你想把a放到子目录中，在上面的命令之前执行以下命令:

cd a
git filter-repo --to-subdirectory-filter a
cd ..

为此你需要安装git-filter-repo(不建议使用filter-branch)。

一个合并两个大型存储库的示例，将其中一个存储库放入子目录:https://gist.github.com/x-yuri/9890ab1079cf4357d6f269d073fd9731

这里有更多。

请看一下使用方法

git rebase --root --preserve-merges --onto

将他们早年的两段历史联系起来。

如果有重叠的路径，用

git filter-branch --index-filter

当您使用日志时，确保您“更难找到副本”

git log -CC

这样，您将发现路径中文件的任何移动。