如何将一个 Git 存储库变基到另一个? [英] How to rebase one Git repository onto another one?

问题描述

我有一个 Git 存储库 (A)，其中包含某个项目的开发直到某个时间点.然后我丢失了这个 repo A 所在的 USB 记忆棒.幸运的是我有最新提交的备份，所以我可以稍后创建一个新的存储库 (B)，在那里我导入最新项目的状态并继续开发.现在我找回了丢失的 U 盘，所以我有两个 Git 存储库.

I had one Git repository (A) which contains the development of a project until a certain point. Then I lost the USB stick this repo A was on. Luckily I had a backup of the latest commit, so I could create a new repository (B) later where I imported the latest project's state and continue development. Now I recovered that lost USB stick, so I have two Git repositories.

我想我只需要以某种方式将 repo B 重新绑定到 repo A 上，但我不知道该怎么做，也许使用 fetch/pull 和 rebase?

I think I just have to rebase repo B onto repo A somehow, but I have no idea how to do that, maybe using fetch/pull and rebase?

推荐答案

如果 A 和 B 不是同一个 repo(您使用最新的工作副本创建了 B)，则必须使用 graft 假装他们有共同的历史.

If A and B are not the same repo (you created B by using the latest working copy you had), you have to use a graft to pretend that they have common history.

假设您已根据 VonC 的回答将 A 添加为 B 的遥控器，并且存储库如下所示¹:

Let’s assume you’ve added A as a remote for B as per VonC’s answer, and the repo looks like this¹:

~/B$ git tnylog 
* 6506232 (HEAD, master) Latest work on B
* 799d6ae Imported backup from USB stick
~/B$ git tnylog A/master
* 33b5b16 (A/master) Head of A
* 6092517 Initial commit

创建一个嫁接告诉 B 的根节点它的父节点是 A 的头部:

Create a graft telling the root of B that its parent is the head of A:

echo '799d6aeb41095a8469d0a12167de8b45db02459c 33b5b16dde3af6f5592c2ca6a1a51d2e97357060' 
 >> .git/info/grafts

现在，当您请求 B 的历史时，上面的两个历史将显示为一个.使移植永久化是一个简单的 git filter-branch 没有参数.但是，在 filter-branch 之后，您不在任何分支上，因此您应该 git branch -D master;git checkout -b master.

Now the two histories above will appear as one when you request the history for B. Making the graft permanent is a simple git filter-branch with no arguments. After the filter-branch, though, you aren’t on any branch, so you should git branch -D master; git checkout -b master.

¹ git tnylog = git log --oneline --graph --decorate

这篇关于如何将一个 Git 存储库变基到另一个?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！