如何恢复特定的提交（创建一个撤销更改的新提交）？

要撤销已推送到仓库的提交但保留历史记录，可使用git revert创建一个新提交来反向应用指定提交的更改。1. 使用git log --oneline查找目标提交的哈希值；2. 执行git revert 或如git revert HEAD~2来撤销特定提交；3. 若存在冲突，手动解决后通过git add标记并运行git revert --continue继续，或用git revert --abort中止；4. 提交信息可编辑确认；5. 对于合并提交，需加-m 1参数。此方法安全适用于共享分支，避免重写历史引发的问题。

You’ve made a commit, pushed it to your repo, and now you want to undo it — but keep the history intact by creating a new commit that reverses those changes. This is a common scenario, especially in team environments where rewriting history can cause issues. Here's how to do it right.

Use git revert to Undo a Commit

The easiest and safest way to undo a specific commit while keeping a traceable history is with git revert. This command creates a new commit that applies the reverse of the targeted commit’s changes.

For example:

git revert HEAD~2

This would create a new commit that undoes the changes from the commit two steps back from the latest (HEAD). If you want to revert the most recent commit, just use:

git revert HEAD

When you run this, Git will open your default text editor so you can confirm or edit the commit message for the new revert commit.

Pro tip: If you’re reverting a merge commit, you’ll need to specify the -m option and indicate which parent you want to consider as the mainline (usually 1).

Find the Commit You Want to Revert

Before running git revert, make sure you know the exact commit hash you want to undo. You can find it using:

git log --oneline

This shows a compact list of commits. Copy the hash of the one you want to revert.

If you're working on a branch shared by others, avoid using git reset to "undo" the commit because it rewrites history. That could mess up other people’s work who have based their changes off the original commits.

Handling Conflicts When Reverting

Sometimes, when you try to revert a commit, Git might show conflicts. This usually happens if later changes overlap with the part of the code being reverted.

In that case:

• Git will pause the revert and mark the conflicting files.
• Open each conflicted file and resolve the conflict manually.
• After resolving, stage the file with git add.
• Then continue the revert process with:

  git revert --continue

If at any point you decide to abort the revert, use:

git revert --abort

Reverts are safe to push to shared branches since they don’t alter existing history — just add a new commit.

So yes, you can definitely undo a specific commit by creating a new one — and git revert is the tool for the job. Just make sure you pick the right commit and handle any conflicts if they come up.基本上就这些。

以上是如何恢复特定的提交（创建一个撤销更改的新提交）？的详细内容。更多信息请关注PHP中文网其他相关文章！