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
To save a stash with a message: git stash push -m “my_stash_name” To list stashes: git stash list All the stashes are stored in a stack. To apply and remove the nth stash: git stash pop stash@{n} To apply and remove a stash by name: git stash pop stash^{/my_stash_name} To apply the nth stash: git … 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
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
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
If you are looking to see the last few commits of a branch, try: git clone -b [branch name] –single-branch [repo url] –depth=3 This will clone only the last 3 commits on the branch you are interested. Once done you can get into the cloned repo and view the history.
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
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
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
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