How to unstash only certain files

Question

I stashed my changes  Now I want to unstash only some files from the stash  How can I do this

User · Answer

For Windows users  curly braces have special meaning in PowerShell  You can either surround with single quotes or escape with backtick  For example   git checkout  stash  0   YourFile   Without it  you may receive an error   Unknown switch  e

User · Answer

As mentioned below  and detailed in  quot How would I extract a single file  or changes to a file  from a git stash  quot   you can apply use git checkout or git show to restore a specific file  git checkout stash  0  --  lt filename gt   With Git 2 23   August 2019   use git restore  which replaces the confusing git checkout command  git restore -s stash  0  --  lt filename gt   That does overwrite filename  make sure you didn t have local modifications  or you might want to merge the stashed file instead   As commented by Jaime M   for certain shell like tcsh where you need to escape the special characters  the syntax would be   git checkout  stash  0   --  lt filename gt    or to save it under another filename   git show stash  0   lt full filename gt    gt    lt newfile gt     note that here  lt full filename gt  is full pathname of a file relative to top directory of a project  think  relative to stash  0      yucer suggests in the comments   If you want to select manually which changes you want to apply from that file   git difftool stash  0   HEAD --  lt filename gt   Vivek adds in the comments   Looks like  quot git checkout stash  0  --  lt filename gt  quot  restores the version of the file as of the time when the stash was performed -- it does NOT apply  just  the stashed changes for that file  To do the latter   git diff stash  0  1 stash  0  --  lt filename gt    git apply   as commented by peterflynn  you might need   git apply -p1 in some cases  removing one  p1  leading slash from traditional diff paths   As commented   quot unstash quot   git stash pop   then   add what you want to keep to the index  git add  stash the rest  git stash --keep-index  The last point is what allows you to keep some file while stashing others  It is illustrated in  quot How to stash only one file out of multiple files that have changed quot

User · Answer

One more way   git diff stash  N    -- path to file1 path to file2    git apply -R

User · Answer

I think VonC s answer is probably what you want  but here s a way to do a selective  git apply    git show stash  0  MyFile txt  gt  MyFile txt

User · Answer

git checkout stash  N   lt File s  Folder s  path gt     Eg  To restore only   test c file and   include folder from last stashed   git checkout stash  0    test c   include

User · Answer

For examle git stash show --name-only  result ofbiz src  project ofbiz src applications baseaccounting entitydef entitymodel view xml ofbiz src applications baselogistics webapp baselogistics delivery purchaseDeliveryDetail ftl ofbiz src applications baselogistics webapp baselogistics transfer listTransfers ftl ofbiz src applications component-load xml ofbiz src applications search config elasticSearch properties ofbiz src framework entity lib jdbc mysql-connector-java-5 1 46 jar ofbiz src framework entity lib jdbc postgresql-9 3-1101 jdbc4 jar  Then pop stash in specific file git checkout stash  0  -- ofbiz src applications baselogistics webapp baselogistics delivery purchaseDeliveryDetail ftl  other related commands git stash list --stat get stash show

User · Answer

First list all the stashes  git stash list      stash  0   WIP on Produktkonfigurator  132c06a5 Cursor bei glyphicon plus und close zu zeigende Hand   ndern stash  1   WIP on Produktkonfigurator  132c06a5 Cursor bei glyphicon plus und close zu zeigende Hand   ndern stash  2   WIP on master  7e450c81 Merge branch  Offlineseite    Then show which files are in the stash  lets pick stash 1    git stash show 1 --name-only    Hint  you can also write   git stash show stash  1  --name-only       ajax product php  ajax productPrice php  errors Company js offlineMain phtml  errors Company mage php  errors Company page phtml  js konfigurator konfigurator js   Then apply the file you like to   git checkout stash  1  --  lt filename gt    or whole folder   git checkout stash  1   errors     It also works without -- but it is recommended to use them  See this post      It is also conventional to recognize a double hyphen as a signal to   stop option interpretation and treat all following arguments   literally

User · Answer

If you git stash pop  with no conflicts  it will remove the stash after it is applied   But if you git stash apply it will apply the patch without removing it from the stash list   Then you can revert the unwanted changes with git checkout -- files

[git] How to unstash only certain files?

The answer is

Examples related to git

Examples related to git-stash

Tags