有2个commit如下,二者有如下依赖关系,commit 1在commit 2基础上提交的
Relation chain
->commit 1:Support function A
commit 2:Update url
现在需要修改commit 2的title为"Update url of server",
操作:
把commit 2代码checkout到本地
git commit --amend //修改title后保存
git push
代码提交成功后发现如下提示:
Relation chain
commit 1:Support function A
(Indirect ancestor)
->Commit 2:Update url of server
Relation chain
->Commit 1:Support function A
commit 2:Update url of server
(Not current)
解决:
需要在commit 2当前代码中再次把commit 1代码cherry-pick下来,然后
git commit --amend
git push