I’m coming late to the party but I got a little scared after thinking I lost this morning’s work due to an IntelliJ Smart Checkout. So I looked to see if there was a fix and this question came up first. Sadly, my git stash list was empty (probably because I tried merging the conflicting … Read more
You can use the diff command with a path: git diff stash@{1} — <path>
git stash is perfectly legitimate, though as Greg said, for some reason fixing the conflicts can get strange. But they are still fixable, you won’t actually fubar anything. The command as I know to re-apply the stash is git stash apply, though pop may be an alternative that I’m not aware of (or it could … Read more
The show sub-command, in the end, invokes git diff with whatever flags you have set, or –stat if you did not set any, so simply git stash show –name-only, which runs git diff –name-only between the base commit and the work-tree commit. (See here and here for a description of what I have taken to … Read more
As of 1.7.7.3, git config –global pager.stash false accomplishes this.
Just use git stash pop or git stash apply. As long as the stashed changes do not conflict with what you pulled or edited, it will just work, if not you get some merge conflicts that you can resolve like when you do a merge or rebase.
EGit 3.5 and later In EGit 3.5 and later, there is a menu called Stashes in the Team context menu. It provides an action to stash changes and also lists any existing stashes. The same menu is also available as a toolbar icon and in the Git Repositories view: Selecting an existing stash from the … Read more
This does not answer the OP’s specific situation but I don’t have enough reputation to add this as a comment… This page is one of the top search results for the error message Too many revisions specified If you are using Posh Git or some other powershell command line then you get the above error … Read more
The issue seems to be that git stash doesn’t save a reference to the branch you were trying to merge in. During a merge, this is stored in a ref named MERGE_HEAD. To fix it and get back to your previous state, you need to find the revision (let’s pretend it’s d7a9884a380f81b2fbf002442ee9c9eaf34ff68d) you were trying … Read more
I don’t think we have to follow all these steps, git stash pop [this will apply your last stashed changes stash{@0}] then again say, git stash [this will create new stash will all the changes to stash@{0}]