git stash pop vs git rebase

Question

I always use git rebase to sync my code, I found that git stash saves the current work and after fetching the latest code from master we can merge it with our code by using git stash pop.

Suppose the sequence is:

git stash, i.e. my current work is saved
git checkout master, then git pull master, i.e. I have fetched latest code from master
git checkout mybranch
git stash pop

I guess this will merge my work with updated code, if instead of git stash pop I will do
git rebase master then the result will be the same or not?

Your suggestion and help will be appreciated, Thanks for your time.

score 13 · Accepted Answer · answered Dec 19 '11 at 11:44

13

The stash is meant to store changes that are not meant to be commited yet. For example if you are working on something that isn't done yet, and you want to work on something else for a while without committing the unfinished work, then you use a stash to store it for later use.

If you however have actual commits, that contain finished work, then use either git merge or git rebase to merge/rebase those commits into the history.

answered Dec 19 '11 at 11:44

poke

369,085
72
557
602

Just realize the existence of this feature! I always do rebasing.. what a shame! Thank you :) – nonintanon Apr 22 '13 at 08:26
More info on when to use `git merge` vs `git rebase` here: http://stackoverflow.com/a/804156/2104168 – cjsimon Mar 21 '17 at 22:14

git stash pop vs git rebase

1 Answers1