How to stash my previous commit

Question

I ve got the following situation on my git log   commit 111   lt -- need to push it to the repository  commit 222   lt -- need to stash this one        As you can see  I need to push only last  without previous  commit to repository   How can I do it  git revert --soft commit hash will help me

User · Accepted Answer

If you ve not pushed either commit to your remote repository  you could use interactive rebasing to  reorder  your commits and stash the  new  most recent commit s changes only  Assuming you have the tip of your current branch  commit 111 in your example  checked out  execute the following  git rebase -i HEAD 2  This will open your default editor  listing most recent 2 commits and provide you with some instructions  Be very cautious as to what you do here  as you are going to effectively  rewrite  the history of your repository  and can potentially lose work if you aren t careful  make a backup of the whole repository first if necessary   I ve estimated commit hashes titles below for example pick 222 commit to be stashed pick 111 commit to be pushed to remote    Rebase 111  222 onto 333     Commands     p  pick   use commit    r  reword   use commit  but edit the commit message    e  edit   use commit  but stop for amending    s  squash   use commit  but meld into previous commit    f  fixup   like  quot squash quot   but discard this commit s log message    x  exec   run command  the rest of the line  using shell     These lines can be re-ordered  they are executed from top to bottom      If you remove a line here THAT COMMIT WILL BE LOST      However  if you remove everything  the rebase will be aborted      Note that empty commits are commented out  Reorder the two commits  they are listed oldest   gt  newest  like this  pick 111 commit to be pushed to remote pick 222 commit to be stashed  Save and exit  at which point git will do some processing to rewrite the two commits you have changed  Assuming no issues  you should have reversed the order of your two changesets  This can be confirmed with git log --oneline -5 which will output newest-first  At this point  you can simply do a soft-reset on the most recent commit  and stash your working changes  git reset --soft HEAD 1 git stash  It s important to mention that this option is only really viable if you have not previously pushed any of these changes to your remote  otherwise it can cause issues for everyone using the repository

User · Answer

I solving doing this  Remove the target commit  git revert --strategy resolve 222  Save commit 222 to patch file  git diff HEAD 2 HEAD 1  gt  222 patch  Apply this patch to unstage  patch -p1  lt  222 patch  Push to stash  git stash  Remove temp file  rm -f 222 patch  Very simple strategy in my opinion

User · Answer

It s works for me    Checkout on commit that is a origin of current branch  Create new branch from this commit  Checkout to new branch  Merge branch with code for stash in new branch  Make soft reset in new branch  Stash your target code  Remove new branch    I recommend use something like a SourceTree for this

User · Answer

An alternative solution uses the stash   Before     dev gitpro  git stash list    dev gitpro  git log --oneline -3    7049dd5  HEAD - gt  master  c111   3f1fa3d c222   0a0f6c4 c333    git reset head 1  lt --- head shifted one back to c222  working still contains c111 changes git stash push -m  commit 111   lt --- staging working  containing c111 changes  stashed  staging working rolled back to revised head  containing c222 changes  git reset head 1  lt --- head shifted one back to c333  working still contains c222 changes git stash push -m  commit 222   lt --- staging working  containing c222 changes  stashed  staging working rolled back to revised head  containing c333 changes  git stash pop stash  1   lt --- oldest stash entry with c111 changes removed  amp  applied to staging working git commit -am  commit 111   lt -- new commit with c111 s changes becomes new head   note you cannot run  git stash pop  without specifying the stash  1  entry  The stash is a LIFO stack -- not FIFO -- so that would incorrectly pop the stash  0  entry with c222 s changes  instead of stash  1  with c111 s changes    note if there are conflicting chunks between commits 111 and 222  then you ll be forced to resolve them when attempting to pop    This would be the case if you went with an alternative rebase solution as well    After     dev gitpro  git stash list  stash  0   On master  c222    dev gitpro  git log -2 --oneline    edbd9e8  HEAD - gt  master  c111   0a0f6c4 c333

User · Answer

If it were me  I would avoid any risky revision editing and do the following instead    Create a new branch on the SHA where 222 was committed  basically as a bookmark  Switch back to the main branch  In it  revert commit 222  Push all the commits that have been made  which will push commit 111 only  because 222 was reverted  Work on the branch from step  1 if needed  Merge from the trunk to it as needed to keep it up to date  I wouldn t bother with stash    When it s time for the changes in commit 222 to go in  that branch can be merged to trunk

[git] How to stash my previous commit?

Examples related to git