{"id":997,"date":"2014-04-11T11:12:10","date_gmt":"2014-04-11T18:12:10","guid":{"rendered":"http:\/\/10kdev.net\/?p=997"},"modified":"2014-04-11T11:22:06","modified_gmt":"2014-04-11T18:22:06","slug":"backing-out-git-commits-with-reset-and-stash","status":"publish","type":"post","link":"http:\/\/10kdev.net\/?p=997","title":{"rendered":"Backing Out Git Commits With Reset And Stash"},"content":{"rendered":"

Our team had some of us working on master in our git repository, and a refactor was done in a branch so the team lead decided we should all move to from the master to the branch because the merge was painful for this particular feature. \u00a0If you have this situation and a few commits in the wrong branch here’s a method that might help out using git reset and git stash. \u00a0Reset<\/em> can undo your last commit, and stash<\/em> can save it off-stream to retrieve whenever you wish.<\/p>\n

For this example I have several commits, not pushed, \u00a0in the local repository already. \u00a0Looking in Tortoise Git log you can see this state \u00a0is three commits ahead of origin\/HEAD.<\/p>\n

\"\"<\/p>\n

The task here is to \u00a0back out the commits from master, save them, then recommit them into the branch. \u00a0There are several ways to accomplish this in git but I am showing the revert-stash methodology.<\/p>\n

Before starting the process, my recommonedation (that you do not need to follow) is to make sure your stash was clear — \u00a0I do so that I can just issue a series of pops to get back to my starting point easily on branch without worrying about mistakes.<\/p>\n

git stash clear<\/code><\/p>\n

Then clean up any other code\/work in progress so that git status<\/em>\u00a0shows clean.<\/p>\n

Next start backing out the commits back to the original HEAD. \u00a0Each commit should be backed and saved atomically as a separate entry to your stash. \u00a0For instance in this example, start at Commit 3 and work back to Commit 1.<\/p>\n

git reset HEAD~1 \u00a0 \u00a0 \u00a0 \u00a0\/\/back out current top commit; 1 every time<\/span>
\ngit status \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \/\/check and see what files you have to stash<\/span>
\ngit add -A :\/ \u00a0 \u00a0 \u00a0 \u00a0 \u00a0\/\/stage all the files listed<\/span>
\ngit stash save Commit# \/\/save the commit to whatever name you choose<\/span>
\ngit status \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0\u00a0\/\/a good place to check status and Tortoise log<\/span><\/code><\/p>\n

….repeat.<\/strong><\/em><\/p>\n

Now when you do\u00a0git stash list<\/em> you can see all the commits ready for moving to the branch, and Tortoise shows master at \u00a0origin\/HEAD so you know that all changes were removed.<\/p>\n

\"\"<\/p>\n

Time to switch branches.<\/p>\n

Issue a git branch -a<\/em> to list all the remotes as well. Switch to your branch:<\/p>\n

git checkout remotebranch<\/code><\/p>\n

Now you can just pop your first stash right off the stack, confirm it works, check it in and move onto the next stash item:<\/p>\n

git stash list \u00a0 \u00a0 \u00a0 \u00a0 \u00a0\/\/just checking<\/span>
\ngit stash pop \u00a0 \u00a0 \u00a0 \u00a0 \u00a0\u00a0\/\/takes first one off list and deletes from stash list<\/span>
\ngit add -A :\/ \u00a0 \u00a0 \u00a0 \u00a0 \u00a0\u00a0\/\/stage everything<\/span>
\n\/\/--> do some merging\/work as needed<\/span>
\nmvn clean install \u00a0 \u00a0 \u00a0 \/\/whatever build process you do to test and check<\/span>
\ngit commit -c \"Commit#\" \/\/commit your code<\/span>
\ngit status \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0 \u00a0\/\/always check your state!!<\/span><\/code><\/p>\n

….repeat.<\/strong><\/em><\/p>\n

Now sync it up with remotebranch HEAD:<\/p>\n

git pull --rebase \/\/just checking that I'm up to date<\/span>
\ngit push \u00a0 \u00a0 \u00a0 \u00a0 \u00a0\/\/send those commits to the homeworld<\/span><\/code><\/p>\n

All done!<\/p>\n","protected":false},"excerpt":{"rendered":"

Our team had some of us working on master in our git repository, and a refactor was done in a branch so the team lead decided we should all move to from the master to the branch because the merge was painful for this particular feature. \u00a0If you have this situation and a few commits […]<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[1],"tags":[],"_links":{"self":[{"href":"http:\/\/10kdev.net\/index.php?rest_route=\/wp\/v2\/posts\/997"}],"collection":[{"href":"http:\/\/10kdev.net\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/10kdev.net\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/10kdev.net\/index.php?rest_route=\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"http:\/\/10kdev.net\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=997"}],"version-history":[{"count":13,"href":"http:\/\/10kdev.net\/index.php?rest_route=\/wp\/v2\/posts\/997\/revisions"}],"predecessor-version":[{"id":1010,"href":"http:\/\/10kdev.net\/index.php?rest_route=\/wp\/v2\/posts\/997\/revisions\/1010"}],"wp:attachment":[{"href":"http:\/\/10kdev.net\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=997"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/10kdev.net\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=997"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/10kdev.net\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=997"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}