Stash changes while keeping the changes in the working directory in Git

git git-stash
Michael Dorst picture Michael Dorst · Jul 24, 2013 · Viewed 38.4k times · Source

Is there a git stash command that stashes your changes, but keeps them in the working directory too? So basically a git stash; git stash apply in one step?

Answer

user456814 picture user456814 · Jul 25, 2013

For what it's worth, another way to do this is to stage the changes you want to keep, and then stash everything using --keep-index:

$ git add modified-file.txt
$ git stash push --keep-index

The commands above will stash everything, but it will leave the files staged in your working directory.

From the official Linux Kernel Git documentation for git stash or from git-scm:

If the --keep-index option is used, all changes already added to the index are left intact.

Related questions

Stash only one file out of multiple files that have changed with Git?

How can I stash only one of multiple changed files on my branch?

Read More
How do I ignore an error on 'git pull' about my local changes would be overwritten by merge?

How do I ignore the following error message on Git pull? Your local changes to the following files would be overwritten by merge What if I want to overwrite them? I've tried things like git pull -f, but nothing works. …

Read More
See what's in a stash without applying it

I see here you can apply/unapply a stash and even create a new branch off of a stash. Is it possible to simply see what is inside the stash without actually applying it?

Read More