What is the difference between IntelliJ's Shelve and Git stash?

git intellij-idea git-stash
Daniel Compton picture Daniel Compton · Oct 7, 2015 · Viewed 32k times · Source

IntelliJ supports git stashes as well as it's own built in shelve command. These seem to be almost identical in purpose and utility. What is the difference between them?

Answer

Daniel Compton picture Daniel Compton · Oct 7, 2015

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 IntelliJ IDEA.
  • Patches with shelved changes are generated by IntelliJ IDEA. Normally, they are also applied through the IDE. Applying shelved changes outside IntelliJ IDEA is also possible but requires additional steps.

Related questions

What to gitignore from the .idea folder?

Possible Duplicate: Intellij Idea 9/10, what folders to check into (or not check into) source control? I started using WebStorm for web development and am not sure what to add and what to exclude from our Git repository. Clearly some files …

Read More
unable to remove file that really exists - fatal: pathspec ... did not match any files

unable to remove file that really exists - fatal: pathspec ... did not match any files I have a file under git control that simply will not be deleted. The failing command is: $ git rm .idea/workspace.xml fatal: pathspec '.…

Read More
Change remote repository credentials (authentication) on Intellij IDEA 14

I recently changed my Bitbucket password for security reasons. However, IntelliJ didn't update my repository to the new credentials, so it stops me from pulling/pushing anything to my repository. I am not using any plugins for this, just the …

Read More