推送失败后如何撤消提交？

Question

I was going to test something in dev branch (just a version number 0.1 --> 0.2), so I committed the change but I don't have the permission to push it to dev directly,then I created a feature branch and I found the number is already 0.2, then I changed it to 0.3 and pushed this branch, then created a merge request to merge it into dev.

I'm new to git, just wondering how can I prevent this kind of messy in the future? How can I revert my commit after the push being rejected?

Answer 1

You could've solved it by reverting the last commit using the command

git reset HEAD~

which would undo your last commit and get your changes of the last commit back to uncommitted state. You can then checkout a feature branch, make the commit and push the feature branch to your remote repo.

Answer 2

You can simply drop the commit from your Git history.

If the commit hasn't been pushed, the following steps can work -

1. Get on the commit you wanna remove.

2. Run git rebase -i HEAD~2

3. Before the commit entry in the file that opens up, change pick to drop .

4. Exit the editor. You should now see the last commit gone.

If you already had pushed the unwanted commit, you'd need to force push to remote. But, force push is only advisable for the feature branch - never force push to the master!

Answer 3

Similar to ros.net 's answer, I was able to do this with the GUI app "Git Extensions", by

1. right-clicking on the commit I wanted to reset/rebase back to,
2. choosing option " Rebase current branch on > " with sub-option " selected commit interactively... "

(click to see image, as my rep is to low to embed them)
right-click menu for undoing a commit with an interactive rebase

This opens up an editor window for the rebasing git command, which lets you choose how handle removing the commits above the rebase commit, and also has an glossary explaining what each command does.

(click to see image, as my rep is to low to embed them)
Initial editor window

For me, I wanted to undo a commit which added several new files, which I already had backups of in a external folder. So I changed 'pick' to 'drop', like so:

(click to see image, as my rep is to low to embed them)
3. pop-up editor window

4. Then I clicked the 'save' button and closed the editor window, and click 'OK' on the command pop-up window, and it was complete.

My un-pushed commits are now gone and my local repo is now reset back to the same commit Head as the Origin repo. My staging and working directory were also emptied. But thankfully I had backed up my new files and could re-commit them to a separate branch that I do have push permissions on.

Further documentation on rebasing with Git Extensions (a free git gui app) can be found here: Git Extensions - How To: Squash and Rebase your changes