When you have changes on your working copy, from command line do: git stash This will stash your changes and clear your status report git pull This will pull changes from upstream branch. Make sure it says fast-forward in the report. If it doesn’t, you are probably doing an unintended merge git stash pop This … Read more
Untracked files are stored in the third parent of a stash commit. (This isn’t actually documented, but is pretty obvious from The commit which introduced the -u feature, 787513…, and the way the rest of the documentation for git-stash phrases things… or just by doing git log –graph ‘stash@{0}’) You can view just the “untracked” … Read more
From the IntelliJ documentation: In the Git integration, in addition to shelving and unshelving, “stashing” and “unstashing” are supported respectively. These features have much in common, the only difference is in the way patches are generated and applied. Patches with stashed changes are generated by Git itself. To apply them later, you do not need … Read more
No and No. git stash is per-repository. Here is a nice page on how to use it.
When I have to apply stashed changes to a dirty working copy, e.g. pop more than one changeset from the stash, I use the following: $ git stash show -p | git apply -3 && git stash drop Basically it creates a patch pipes that to the apply command if there are any conflicts they … Read more
TL;DR Use git log <branch> where <branch> is the name of the branch of interest. From the git-log man-page… A simplified version of the git-log synopsis given in that command’s man page is git log [<revision range>] Further down, you can find the following passage: When no <revision range> is specified, it defaults to HEAD … Read more
You can get a list of all stashes with git stash list which will show you something like stash@{0}: WIP on dev: 1f6f8bb Commit message A stash@{1}: WIP on master: 50cf63b Commit message B If you made two stashes, then just call git stash pop twice. As opposed to git stash apply, pop applies and … 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
First, check git status. As the OP mentions, The actual issue was an unresolved merge conflict from the merge, NOT that the stash would cause a merge conflict. That is where git status would mention that file as being “both modified“ Resolution: Commit the conflicted file. Solution: in this case, simply add and commit your … Read more
Sure, git stash show supports this: git stash show -p So, use git stash list to find out the number of the stash that you want to export as a patch, then git stash show -p stash@{<number>} > <name>.patch to export it. For example: git stash show -p stash@{3} > third_stash.patch