GIT : How to save local commits for future

[Sangel Kapoor]

GIVEN :  I am working on Story and I  have already made some local commits. and I cannot push since CRs take long time to review.

NOW : My Manager want me to work on different small story and push it asap.

What I need :  I want to save these local commits somewhere and work for new story to fix issue and push it.
                      After pushing I want my local commits to come back so that I continue my work on original story .

       I want to know your preferred way of doing this ?

[Stephan van Hulst]

You should create a branch for each of your stories. You should be able to push your branches to the origin server, and Code Review should occur when you create a pull request to merge a branch into the master branch.

If your current code is not yet in a separate branch, then create a new branch for it, switch to the branch you were working on, and perform a hard reset to the commit that you want to base the new story on. Then create a new branch for the new story.
git branch <old story> git reset --hard <base commit for new story> git checkout -b <new story>
After you're done with your new branch, you can switch back to the old branch:
git checkout <old story>