[英]Git Move Not-Pushed Commit from temp to master branch
How do I get from this 我如何从中得到
A -- B -- C [masterbranch, origin/HEAD, origin/master, HEAD]
\
D -- E -- F [tempbranch]
to this: 对此:
A -- B -- C -- F [masterbranch ,origin/HEAD, origin/master, HEAD]
\
D -- E [tempbranch]
I don't want to deal with merging, just have 100% from commit F as the end point of my master-branch. 我不想处理合并,只需将提交F中的100%作为我的主分支的终点。
Simply use git cherry-pick
to apply the commit to your master branch. 只需使用git cherry-pick
将提交应用于主分支即可。 This commands should produce the desired situation: 此命令应产生所需的情况:
git cherry-pick <id of F>
git checkout tempbranch
git reset --hard HEAD~1
git checkout masterbranch
git push
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.