如何将子树添加到我的git存储库中？

要将子树添加到Git仓库，首先添加远程仓库并获取其历史记录，接着使用git merge和git read-tree命令将其合并为子目录。步骤如下：1. 使用git remote add -f命令添加远程仓库；2. 运行git merge --s recursive --no-commit获取分支内容；3. 使用git read-tree --prefix=指定目录将项目作为子树合并；4. 提交更改以完成添加；5. 更新时先git fetch再重复合并步骤提交更新。此方法保持外部项目历史完整且便于维护。

Adding a subtree to your Git repository is a useful way to include another project as a subdirectory inside your main repo, while still keeping its history intact. It’s especially handy when you want to pull in third-party libraries or share code between projects without using submodules. Here’s how to do it effectively.

Setting up the remote

Before adding a subtree, you need to have the remote repository set up. If you haven’t already added it as a remote, now’s the time to do so. This makes it easier to update later.

You can add a new remote like this:

git remote add -f <remote-name> <repository-url>

For example:

git remote add -f vendor https://github.com/example/external-project.git

The -f flag fetches the remote right away, which saves you a step. Once that's done, you're ready to actually merge it into your project.

Merging the subtree

Now comes the actual process of merging the external repo as a subtree. You’ll use git merge with the --s recursive and --no-commit flags to avoid conflicts and keep things flexible.

Here’s the basic command:

git merge --s recursive --no-commit <remote-name>/<branch-name>

Then tell Git that this is a subtree:

git read-tree --prefix=<subdir-name>/ -u <remote-name>/<branch-name>

So if you were adding the vendor remote's main branch into a folder called lib/external, it would look like:

git merge --s recursive --no-commit vendor/main
git read-tree --prefix=lib/external -u vendor/main

Finally, commit the changes:

git commit -m "Added external project as subtree"

This will bring the entire project into your repo under the specified directory.

Updating the subtree

One of the nice things about subtrees is that you can update them easily. When the external project gets new commits, just pull those changes into your subtree:

1. Fetch the latest changes from the remote:

   git fetch vendor

2. Merge the updates using the same subtree logic:

   git merge --s recursive --no-commit vendor/main
   git read-tree --prefix=lib/external -u vendor/main
   git commit -m "Updated external subtree"

   This keeps your embedded project current without having to manually copy files.

   ---

   That’s basically it. Once you’ve got the hang of it, working with subtrees becomes second nature — it's not complicated, but it's easy to overlook small steps like fetching first or using the correct prefix. Keep a quick reference handy until it clicks.

   以上是如何将子树添加到我的git存储库中？的详细内容。更多信息请关注PHP中文网其他相关文章！