Use git cherry-pick

最新推荐文章于 2024-10-09 17:13:30 发布

原创最新推荐文章于 2024-10-09 17:13:30 发布 · 421 阅读

1 ·

CC 4.0 BY-SA版权

Git 专栏收录该内容

11 篇文章

订阅专栏

本文介绍了如何使用git cherry-pick命令来撤销误操作的将其他分支的更改合并到当前分支的操作，通过详细的步骤指导用户进行回滚。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

If you used commit -a -m to commit other branch's changes(branch A) to the current branch(branchB) by mistake, you want to put the last commit back branch A, so use
git cherry-pick logid
where, logid is the log id, which you can get from "git log"

The detail steps:
1. git checkout branch_B // go to branch_B
2. git log // Check the git log to get thelog id
3. git checkout branch_A // Got the branch A
4. git cherry-pick log_id // execute cherry-pick
5. git log // Check the log and you will find it works.
6. git checkout branch_B // go to branch_B
7. git reflog // you want to reset to the position before you commit, remember the reflog_id.
8. git reset --hard reflog_id // reset to the position before you commit

Over.