为了详细说明这个答案，如果你有多个提交要从，例如develop到new_branch:

git checkout develop # You're probably there already
git reflog # Find LAST_GOOD, FIRST_NEW, LAST_NEW hashes
git checkout new_branch
git cherry-pick FIRST_NEW^..LAST_NEW # ^.. includes FIRST_NEW
git reflog # Confirm that your commits are safely home in their new branch!
git checkout develop
git reset --hard LAST_GOOD # develop is now back where it started

用于在错误的分支上进行多次提交

如果对你来说，它只是1次提交，那么有很多其他更简单的重置解决方案可用。对于我来说，我无意中在主分支上创建了大约10个提交，而不是，让我们称之为目标，我不想失去提交历史。

你能做的，也是拯救我的，就是把这个答案作为参考，用一个4步的过程，也就是:

从master创建一个新的临时分支temp 将temp合并到最初用于提交的分支中，即目标 在主服务器上撤销提交 删除临时分支temp。

以下是上述步骤的详细说明:

Create a new branch from the master (where I had accidentally committed a lot of changes) git checkout -b temp Note: -b flag is used to create a new branch Just to verify if we got this right, I'd do a quick git branch to make sure we are on the temp branch and a git log to check if we got the commits right. Merge the temporary branch into the branch originally intended for the commits, i.e. target. First, switch to the original branch i.e. target (You might need to git fetch if you haven't) git checkout target Note: Not using -b flag Now, let's merge the temporary branch into the branch we have currently checkout out target git merge temp You might have to take care of some conflicts here, if there are. You can push (I would) or move on to the next steps, after successfully merging. Undo the accidental commits on master using this answer as reference, first switch to the master git checkout master then undo it all the way back to match the remote using the command below (or to particular commit, using appropriate command, if you want) git reset --hard origin/master Again, I'd do a git log before and after just to make sure that the intended changes took effect. Erasing the evidence, that is deleting the temporary branch. For this, first you need to checkout the branch that the temp was merged into, i.e. target (If you stay on master and execute the command below, you might get a error: The branch 'temp' is not fully merged), so let's git checkout target and then delete the proof of this mishap git branch -d temp

保留更改并取消提交 简单的解决方案是运行该命令。

git reset HEAD^

这将取消提交代码，同时保留您的更改

我最近做了同样的事情，当我应该提交给其他分支时，我不小心提交了一个更改给master。但我没有推动任何东西。

如果你只是提交了错误的分支，并且从那以后没有改变任何东西，也没有推送到回购，那么你可以执行以下操作:

// rewind master to point to the commit just before your most recent commit.
// this takes all changes in your most recent commit, and turns them into unstaged changes. 
git reset HEAD~1 

// temporarily save your unstaged changes as a commit that's not attached to any branch using git stash
// all temporary commits created with git stash are put into a stack of temporary commits.
git stash

// create other-branch (if the other branch doesn't already exist)
git branch other-branch

// checkout the other branch you should have committed to.
git checkout other-branch

// take the temporary commit you created, and apply all of those changes to the new branch. 
//This also deletes the temporary commit from the stack of temp commits.
git stash pop

// add the changes you want with git add...

// re-commit your changes onto other-branch
git commit -m "some message..."

注意:在上面的例子中，我用git重置HEAD~1来重卷1提交。但如果你想倒带n次提交，你可以做git reset HEAD~n。

同样，如果你最终提交了错误的分支，并且在意识到你提交了错误的分支之前写了更多的代码，那么你可以使用git stash来保存你正在进行的工作:

// save the not-ready-to-commit work you're in the middle of
git stash 

// rewind n commits
git reset HEAD~n 

// stash the committed changes as a single temp commit onto the stack. 
git stash 

// create other-branch (if it doesn't already exist)
git branch other-branch

// checkout the other branch you should have committed to.
git checkout other-branch

// apply all the committed changes to the new branch
git stash pop

// add the changes you want with git add...

// re-commit your changes onto the new branch as a single commit.
git commit -m "some message..."

// pop the changes you were in the middle of and continue coding
git stash pop

注意:我使用这个网站作为参考 https://www.clearvision-cm.com/blog/what-to-do-when-you-commit-to-the-wrong-git-branch/

如果你有一个干净的(未修改的)工作副本

回滚一次提交(确保你注意到了下一步的提交散列):

git reset --hard HEAD^

将该提交拉到不同的分支:

git checkout other-branch
git cherry-pick COMMIT-HASH

如果您已修改或未跟踪更改

还需要注意的是，git reset -hard会杀死你可能拥有的任何未跟踪和修改的更改，所以如果你有这些更改，你可能更喜欢:

git reset HEAD^
git checkout .

如果你想要应用你的更改的分支已经存在(例如分支开发)，遵循下面fotanus提供的说明，那么:

git checkout develop
git rebase develop my_feature # applies changes to correct branch
git checkout develop # 'cuz rebasing will leave you on my_feature
git merge develop my_feature # will be a fast-forward
git branch -d my_feature

显然，如果你愿意，你可以使用tempbranch或任何其他分支名称来代替my_feature。

同样，如果适用的话，将stash弹出(apply)延迟到合并目标分支之后。