I want to cancel the blue commit
Is there a effective way to do it???
Thanks!
- 1git reverttimrau– timrau2013-03-27 12:33:01 +00:00Commented Mar 27, 2013 at 12:33
- git rebase -ibrice– brice2013-03-27 12:33:37 +00:00Commented Mar 27, 2013 at 12:33
Add a comment |
3 Answers
I think that you have a couple options for getting rid of that commit (and some are mentioned in the comments above):
git revert <commit_id>- this will show in the git history that you specifically removed the codegit reset --hard <commit_id_before_your_commit>then cherry pick the commits you want to keepgit cherry-pick <commit_id_to_keep>x2 and finally force push to the origingit rebase -i origin/wix- interactive rebase the branch, and SKIP that commit when you get to it
The latter two options will not show any trace of that commit in your branch history, where as the first option will show that the commit existed but you opted to remove it.
Comments
You can do a revert
git revert <commit-id> 
Comments
Additionally to the revert:
If you haven't pushed the changes yet (the line saying remotes/origin/wlx suggesting that):
> git rebase -i remotes/origin/wlx This will open an editor asking you what to do with the commits. Deleting any of the lines will drop that commit from the history.
