Internally, each stash is stored as a commit linked to the commit that was the HEAD at the moment when the stash was created, but not linked to the previous stash (if any). Tied to this is that gitextensions sort of makes a branch out of my stashes, so I may be able to stash but treat it like a branch when grabbing individual files. I'm using git coming from Perforce, so I'm trying to make stash fit in the 'shelve' mold, but I think branching is the better way to do it. It allows fine control over what is added to the stash. This approach allows you to merge the changes into the current branch later, to cherry-pick only some commits or even some files from them.ġ git stash save provides the option -patch that allows the user to interactively selects hunks from the diff between HEAD and the working tree to be stashed. Then just checkout the previous branch and you're done. You can do what you want (and in a more flexible way than stashing) if you create a new branch and commit the changes on it (in any amount or combination you want) until you reach the status you desire. as it was immediately after your last commit on the current branch).

It provides very little support 1 to handle individual files because its purpose is to safely store your current changes and quickly bring your working tree to a clean state (i.e. The command saves your local modifications away and reverts the working directory to match the HEAD commit. Use git stash when you want to record the current state of the working directory and the index, but want to go back to a clean working directory.

Git stash drop