I think stash -p is probably the choice you want, but just in case you run into other even more tricky things in the future, remember that:
Stash is really just a very simple alternative to the only slightly more complex branch sets. Stash is very useful for moving things around quickly, but you can accomplish more complex things with branches without that much more headache and work.
# git checkout -b tmpbranch # git add the_file # git commit -m "stashing the_file" # git checkout master
go about and do what you want, and then later simply rebase and/or merge the tmpbranch. It really isn’t that much extra work when you need to do more careful tracking than stash will allow.
Related Posts:
- How to Git stash pop specific stash in 1.8.3?
- git stash apply version
- How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
- Stash only one file out of multiple files that have changed with Git?
- How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
- Stash only one file out of multiple files that have changed with Git?
- How can I git stash a specific file?
- How can I git stash a specific file?
- How do you stash an untracked file?
- How to name and retrieve a stash by name in git?
- How do you stash an untracked file?
- How to name and retrieve a stash by name in git?
- Stash just a single file
- How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
- How to delete a stash created with git stash create?
- Undo git stash pop that results in merge conflict
- Git diff against a stash
- Move existing, uncommitted work to a new branch in Git
- Git stash pop- needs merge, unable to refresh index
- How to recover stashed uncommitted changes
- Difference between git stash pop and git stash apply
- What is git tag, How to create tags & How to checkout git remote tag(s)
- What is the best (and safest) way to merge a Git branch into master?
- Squash my last X commits together using Git
- How to apply a patch generated with git format-patch?
- Abort a Git Merge
- GitHub: Permission denied (publickey). fatal: Could not read from remote repository
- How to delete a remote tag?
- Updates were rejected because the tip of your current branch is behind its remote counterpart
- Updates were rejected because the tip of your current branch is behind its remote counterpart
- Git fetch remote branch
- Updating a local repository with changes from a GitHub repository
- How do I remove a submodule?
- Git push results in “Authentication Failed”
- What does “Changes not staged for commit” mean
- git: fatal: Could not read from remote repository
- Git push results in “Authentication Failed”
- Download single files from GitHub
- How do I update Homebrew?
- Git error when trying to push — pre-receive hook declined
- Gitignore not working
- Could not open a connection to your authentication agent
- How to get just one file from another branch?
- git checkout a single file from another branch and put in different folder
- Update Git branches from master
- Create a branch in Git from another branch
- github website publish cannot publish unborn HEAD
- What is HEAD in Git?
- What are the differences between git remote prune, git prune, git fetch –prune, etc
- How to get the current branch name in Git?
- How do I resolve git saying “Commit your changes or stash them before you can merge”?
- Filename too long in Git for Windows
- What is the difference between git rm –cached and git reset
? - What does git rev-parse do?
- How can I reset or revert a file to a specific revision?
- How do I provide a username and password when running “git clone [email protected]”?
- “*** Please tell me who you are.” when using SSH key
- master branch and ‘origin/master’ have diverged, how to ‘undiverge’ branches’?
- Pull request vs Merge request
- git pull from master into the development branch
- Clone A Private Repository (Github)
- Is there a “theirs” version of “git merge -s ours”?
- Your configuration specifies to merge with the
from the remote, but no such ref was fetched.? - How to clone a specific Git tag
- ! [rejected] master -> master (fetch first)
- Heroku: How to change a Git remote on Heroku
- Updates were rejected because the remote contains work that you do not have locally
- fatal: This operation must be run in a work tree
- Undoing a ‘git push’
- How to replace local branch with remote branch entirely in Git?
- What’s the significance of the “No newline at end of file” log?
- How to revert a “git rm -r .”?
- Git update submodules recursively
- Do a “git export” (like “svn export”)?
- What does git push origin HEAD mean?
- How do I set up Eclipse/EGit with GitHub?
- Repository size limits for GitHub.com
- How to clone git repository with specific revision/changeset?
- How to compare a local Git branch with its remote branch
- git push origin master does not work
- Found a swap file by the name
- Git clone verbose output?
- Could not create work tree dir ‘example.com’.: Permission denied
- Is there a git-merge –dry-run option?
- How to answer the git prompt in npm init for a local repo
- How to update Git clone
- Git says “Automatic merge failed”, what does it mean?
- Sourcetree adding files in global .gitignore, not in repository .gitignore
- How to configure git bash command line completion?
- How to stop tracking and ignore changes to a file in Git?
- Git Push Error: insufficient permission for adding an object to repository database
- Git push requires username and password
- WordPress and Git – What folders should I track?
- Pull latest stable release via git [closed]
- Why do the Roots theme CSS files not load (404)?
- Version control with a team of non-developers
- Painless way to track remote Git repo for WordPress updates
- Questions about Git and WordPress [duplicate]
- WordPress on git – need help with configuration
- What’s is the best stack for cPanel continuous deployment?