git stash pop throws away the (topmost, by default) stash after applying it, whereas git stash apply leaves it in the stash list for possible later reuse (or you can then git stash drop it). This happens unless there are conflicts after git stash pop, in which case it will not remove the stash, leaving … Read more
Quick “TL;DR” take-away version, so one can come back later and study more git stash hangs a stash-bag—this is a peculiar form of a merge commit that is not on any branch—on the current HEAD commit. A later git stash apply, when you’re at any commit—probably a different commit—then tries to restore the changes git … Read more
git stash push -p -m “my commit message” -p let’s you select the hunks that should be stashed; whole files can be selected as well. You’ll be prompted with a few actions for each hunk: y – stash this hunk n – do not stash this hunk q – quit; do not stash this hunk … Read more
Once you know the hash of the stash commit you dropped, you can apply it as a stash: git stash apply $stash_hash Or, you can create a separate branch for it with git branch recovered $stash_hash After that, you can do whatever you want with all the normal tools. When you’re done, just blow the … Read more
EDIT: Since git 2.13, there is a command to save a specific path to the stash: git stash push <path>. For example: git stash push -m welcome_cart app/views/cart/welcome.thtml OLD ANSWER: You can do that using git stash –patch (or git stash -p) — you’ll enter interactive mode where you’ll be presented with each hunk that … Read more
To stash your working directory including untracked files (especially those that are in the .gitignore) then you probably want to use this cmd: git stash –include-untracked Alternatively, you can use the shorthand -u instead of –include-untracked, or simply git stash –all which stashes all files, including untracked and ignored files. This bahaviour changed in 2018, … Read more
Note: I’ve just rewritten this answer with 24 hours more git-fu under my belt 🙂 In my shell history, the whole shebang is now three one-liners. However, I’ve uncondensed them for your convenience. This way, I hope you will be able to see how I did things, instead of just having to blindly copy/paste stuff. … Read more
git stash push -p -m “my commit message” -p let’s you select the hunks that should be stashed; whole files can be selected as well. You’ll be prompted with a few actions for each hunk: y – stash this hunk n – do not stash this hunk q – quit; do not stash this hunk … Read more
If you want remove all local changes – including files that are untracked by git – from your working copy, simply stash them: git stash push –include-untracked If you don’t need them anymore, you now can drop that stash: git stash drop If you don’t want to stash changes that you already staged – e.g. … Read more
There is—but let’s get there in a slightly roundabout fashion. (Also, see warning below: there’s a bug in the stash code which I thought was very rare, but apparently more people are running into. New warning, added in Dec 2021: git stash has been rewritten in C and has a whole new crop of bugs. … Read more