Sometimes one might get into the unfortunate need to change a git commit. In this post I will show some options to revert or change commits which are not yet pushed to an remote branch.<\/p>\n
It’s quite easy to undo the last git commit using:<\/p>\n
This will remove the very last commit from your local working tree. Your latest changes will still be there and you can just edit them to your needs. When done use In case you need\u00a0to edit one specific commit, instead of the last one, git also enables us to do<\/p>\n In this example I have two commits. I need to change the first one, while the last one should stay untouched.<\/p>\n In this\u00a0example the commit we want to edit has the id ‘5b5a753329764c9a51935b43961a6598a860f96d’<\/li>\n This will open an text editor and will show your last commits.<\/li>\n If you are using nano as your editor you can close the editor with CTRL + X and then typing ‘y’ to save it.<\/li>\n Now Git will change all\u00a0subsequent commits and update the mistakes.<\/p>\n If those\u00a0subsequent commits affect the corrected lines you might need to fix merge conflicts.<\/p>\n","protected":false},"excerpt":{"rendered":" Sometimes one might get into the unfortunate need to change a git commit. In this post I will show some options to revert or change commits which are not yet pushed to an remote branch.<\/p>\n","protected":false},"author":29,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[92,79],"tags":[],"class_list":["post-988","post","type-post","status-publish","format-standard","hentry","category-others","category-tooling"],"yoast_head":"\ngit reset HEAD~<\/code><\/p>\n
\ngit add .<\/code>
\nto add the files into your local working branch again and commit your fix.<\/p>\nUndo any commit<\/h4>\n
\n
git log
\n<\/code><\/code><\/p>\n$ git log\r\ncommit 54092b52ac09c32b6712fd6f39e28680bf1507fa\r\nAuthor: Anonymous\r\nDate: Tue Aug 23 16:14:18 2016 +0200\r\n\r\n good commit\r\n\r\ncommit 5b5a753329764c9a51935b43961a6598a860f96d\r\nAuthor: Anonymous\r\nDate: Tue Aug 23 16:13:41 2016 +0200\r\n\r\n bad commit\r\n<\/pre>\n
git rebase --interactive \"COMMIT-ID\"^
\n<\/code><\/code><\/p>\npick 5b5a753 bad commit\r\npick 54092b5 good commit<\/pre>\n
edit 5b5a753 bad commit\r\npick 54092b5 good commit\r\n<\/pre>\n
git add .<\/code><\/li>\ngit commit --amend<\/code><\/li>\ngit rebase --continue to merge your changed commit with your other commit.<\/code><\/li>\n<\/ol>\n