Posted on 2021-04-02 14:33
宋鹏 阅读(898)
评论(0) 编辑 收藏 引用 所属分类:
Git
1. Assume the following history exists and the current branch is "topic":
A---B---C topic
/
D---E---F---G master
From this point, the result of either of the following commands:
git rebase master
git rebase master topic
would be:
A'--B'--C' topic
/
D---E---F---G master
2. git rebase 过程中：
在修改完需要merge的文件后，用git add和git status来确认rebase状态，然后再git rebase --continue