The keys into the stash are actually the stash@{n} items on the left. So try: git stash apply stash@{0} (note that in some shells you need to quote “stash@{0}”, like zsh, fish and powershell). Since version 2.11, it’s pretty easy, you can use the N stack number instead of using stash@{n}. So now instead of … Read more
git stash show will show you the files that changed in your most recent stash. You can add the -p option to show the diff. git stash show -p If the stash you are interested in is not the most recent one, then add the name of the stash to the end of the command: … 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
As it turns out, Git is smart enough not to drop a stash if it doesn’t apply cleanly. I was able to get to the desired state with the following steps: To unstage the merge conflicts: git reset HEAD . (note the trailing dot) To save the conflicted merge (just in case): git stash To … Read more
git stash drop takes no parameter – which drops the top stash – or a stash reference which looks like: stash@{n} which n nominates which stash to drop. You can’t pass a commit id to git stash drop. git stash drop # drop top hash, stash@{0} git stash drop stash@{n} # drop specific stash – … Read more
The easy answer to the easy question is git stash apply Just check out the branch you want your changes on, and then git stash apply. Then use git diff to see the result. After you’re all done with your changes—the apply looks good and you’re sure you don’t need the stash any more—then use … Read more
On the git stash manpage you can read (in the “Discussion” section, just after “Options” description) that: A stash is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at HEAD when the stash was created. So you can treat stash (e.g. stash@{0} is … Read more
No need to stash. Update 2020 / Git 2.23 Git 2.23 adds the new switch subcommand, in an attempt to clear some of the confusion caused by the overloaded usage of checkout (switching branches, restoring files, detaching HEAD, etc.) Starting with this version of Git, replace the git checkout command below with: git switch -c … Read more
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
See the most recent stash: git stash show -p See an arbitrary stash: git stash show -p stash@{1} From the git stash manpages: By default, the command shows the diffstat, but it will accept any format known to git diff (e.g., git stash show -p stash@{1} to view the second most recent stash in patch … Read more