我有一个在 svn 存储库中有超过 3 年历史的项目。它被迁移到了 git,但是这样做的人,只是拿了最后一个版本,把这 3 年的历史全部扔掉了。
现在该项目在一个存储库中具有最近 3-4 个月的历史记录,并且我已将另外 3 年的 svn 历史记录导入到一个新的 git 存储库中。
有没有办法将第二个存储库的根提交连接到第一个存储库的最后一个提交?
它是这样的:
* 2017-04-21 - last commit on master
|
* 2017-03-20 - merge branch Y into master
|\
| * 2017-03-19 - commit on branch Y
| |
* | 2017-03-18 - merge branch X into master
/| * 2017-02-17 - commit on another new branch Y
* |/ 2017-02-16 - commit on branch X
| * 2017-02-15 - commit on master branch
* | 2017-01-14 - commit on new branch X
\|
* 2017-01-13 - first commit on new repository
|
* 2017-01-12 - init new git project with the last version of the code in svn repository
.
.
There is no relationship between the two different repositories yet, this is what I wanna
do. I want to connect the root commit of 2nd repository with the last commit of the first
one.
.
.
* 2017-01-09 - commit
|
* 2017-01-08 - commit
|
* 2017-01-07 - merge
/|
* | 2016-01-06 - 2nd commit the other branch
| * 2016-01-05 - commit on trunk
* | 2016-01-04 - commit on new branch
\|
* 2015-01-03 - first commit
|
* 2015-01-02 - beggining of the project
更新:
我刚知道我需要做 a 答案是使用git rebase
,但是怎么做?请让我们考虑一下提交日期,就像它是 SHA-1 代码一样......git filter-branch
with--parent-filter
选项,而不是git rebase
.
更新 2:
我尝试了该命令git filter-branch --parent-filter 'test $GIT_COMMIT = 443aec8880e898710796a1c4fb4decea1ca5ff66 && echo "-p 98e2b95e07b84ad1e40c3231e66840ea910e9d66" || cat' HEAD
,但它不起作用:
PS D:\git\rebase-test\rep2cc> git filter-branch --parent-filter 'test $GIT_COMMIT = 443aec8880e898710796a1c4fb4decea1ca5ff66 && echo "-p 98e2b95e07b84ad1e40c3231e66840ea910e9d66" || cat' HEAD
fatal: ambiguous argument '98e2b95e07b84ad1e40c3231e66840ea910e9d66 || cat': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
更新 3:
它在 Windows CMD 或 PowerShell 上不起作用,但在 Windows 上的 Git Bash 中确实有效。