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
- How do I check out a remote Git branch?
- How to use Git Revert
- How do I properly force a Git push?
- How to remove local (untracked) files from the current Git working tree
- How to modify existing, unpushed commit messages?
- How do I clone a specific Git branch? [duplicate]
- Git pushing to remote branch
- How to revert a merge commit that’s already pushed to remote branch?
- GitHub Error Message – Permission denied (publickey)
- Git : fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists
- How do I push a new local branch to a remote Git repository and track it too?
- How do you push a tag to a remote repository using Git?
- Remove files from Git commit
- Gitignore not working
- How to solve SSL certificate: self signed certificate when cloning repo from github?
- How do I resolve git saying “Commit your changes or stash them before you can merge”?
- How do I rename both a Git local and remote branch name?
- Why does git say “Pull is not possible because you have unmerged files”?
- How to cherry-pick multiple commits
- Another git process seems to be running in this repository
- rejected master -> master (non-fast-forward)
- merge one local branch into another local branch
- Move the most recent commit(s) to a new branch with Git
- What does “Git push non-fast-forward updates were rejected” mean?
- How do I diff the same file between two different commits on the same branch?
- You have not concluded your merge (MERGE_HEAD exists)
- How to get the current branch name in Git?
- Git error on commit after merge – fatal: cannot do a partial commit during a merge
- Is there a “theirs” version of “git merge -s ours”?
- Meaning of the GitHub message: push declined due to email privacy restrictions
- Is there a command to undo git init?
- How to undo ‘git reset’?
- Download a single folder or directory from a GitHub repo
- fatal: Not a valid object name: ‘master’
- Git and nasty “error: cannot lock existing info/refs fatal”
- Is there a “git touch” so I can push the same file with a new timestamp?
- Branch from a previous commit using Git
- How do I delete a local repository in git?
- Throw away local commits in Git
- Hard reset of a single file
- Not a valid object name: ‘master’
- git add remote branch
- How do I copy a version of a single file from one Git branch to another?
- Undo a git stash
- Git: cannot checkout branch – error: pathspec ‘…’ did not match any file(s) known to git
- Set up git to pull and push all branches
- Unity Collaborate vs GitHub
- What is the difference between pull and clone in git?
- How do I clone a single branch in Git?
- how to reset develop branch to master
- “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
- SourceTree keeps asking for Github password
- How to change the license for a project at Github?
- Git add all files modified, deleted, and untracked?
- How to switch back to ‘master’ with git?
- fatal: could not read Username for ‘https://github.com’: No such file or directory
- Github Authentication Failed – … GitHub does not provide shell access
- How do I pull files from remote without overwriting local files?
- How to keep a branch synchronized/updated with master?
- TortoiseGit-git did not exit cleanly (exit code 1)
- How to `git pull` while ignoring local changes?
- Your repository has no remotes configured to push to
- Uninitialize git repository
- Specify an SSH key for git push for a given domain
- How do I “un-revert” a reverted Git commit?
- git push not send changes to remote git repository
- How to merge a specific commit in Git
- How do I clone a subdirectory only of a Git repository?
- What is the .git folder?
- How to use Git and Dropbox together?
- Git: Where exactly is the “working directory”?
- What exactly does the “u” do? “git push -u origin master” vs “git push origin master”
- Create empty branch on GitHub
- Git – fatal: Unable to create ‘/path/my_project/.git/index.lock’: File exists
- Collaboratively develop a WordPress site
- Add latest commit info on login footer using login_footer hook
- WordPress Core files not being ignored by Git
- Display GitLab repositories of the logged in user on a page
- Full site editor, hard-coded IDs in query blocks, and staging/dev servers