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
Update 2020 / Git 2.23 Git 2.23 adds the new switch subcommand in an attempt to clear some of the confusion that comes from the overloaded usage of checkout (switching branches, restoring files, detaching HEAD, etc.) Starting with this version of Git, replace the checkout command with: git switch -c <new-branch> The behavior is identical … Read more
TL;DR version: You need the directory to be clean (in git clean terms) for the stash to apply properly. This means running git clean -f, or even git clean -fdx, which is kind of an ugly thing to have to do, since some of the untracked or untracked-and-ignored files/directories may be items you want to … Read more
For Git 2.6+ (released 28 Sept 2015) The only git config setting which would be of interest is: rebase.autostash (with Git 2.27, Q2 2020, you now also have merge.autostash, see below) When set to true, automatically create a temporary stash before the operation begins, and apply it after the operation ends. This means that you … Read more