git-stash

When should I use git stash save instead of git stash push and vice-versa? git stash save accepts a single non-option argument — the stash message. git stash push accepts the message with option -m and accepts a list of files to stash as arguments. VonC Just to be clear, starting Git 2.15/2.16 (Q1 2018), git stash save has been deprecated in favour of git stash push (though git stash save is still available for the time being). See commit c0c0c82 , commit fd2ebf1 , commit db37745 (22 Oct 2017) by Thomas Gummerer ( tgummerer ) . (Merged by Junio C Hamano -- gitster -- in commit 40f1293 , 06 Nov

If I run git stash -u , I can stash untracked files. However, said untracked files don't show up at all with git stash show stash@{0} . Is there any way to show untracked stashed files without applying the stash? 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" portion of the stash via: git show stash@{0}^3 or,

I have a stash with an incorrect name. I would like to fix the name so it's accurate. How can I rename a stash? Let's assume your stash list looks like this: $ git stash list stash@{0}: WIP on master: Add some very important feature stash@{1}: WIP on master: Fix some silly bug First, you must remove stash entry which you want to rename: $ git stash drop stash@{1} Dropped stash@{1} (af8fdeee49a03d1b4609f294635e7f0d622e03db) Now just add it again with new message using sha of commit returned after dropping: $ git stash store -m "Very descriptive message" af8fdeee49a03d1b4609f294635e7f0d622e03db

I stashed my changes. Now I want to unstash only some files from the stash. How can I do this? As mentioned below , and detailed in " How would I extract a single file (or changes to a file) from a git stash? ", you can apply use git checkout or git show to restore a specific file. git checkout stash@{0} -- <filename> 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

I've been using git stash pop for quite some time. I recently found out about the git stash apply command. When I tried it out, it seemed to work the same as git stash pop . What is the difference between git stash pop and git stash apply ? John Zwinck git stash pop throws away the (topmost, by default) stash after applying it, whereas git stash apply leaves it in the stash list for possible later reuse (or you can then git stash drop it). This happens unless there are conflicts after git stash pop , in which case it will not remove the stash, leaving it to behave exactly like git stash apply

I have a large git project that I, stupidly, imported to eclipse and ran an autoformat on. Now, every file in the project is showing as modified. Rather than commit my formatted files, I would rather revert all the files that I have only been formatted and not had other changes. For instance: $ git status # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # (commit or discard the untracked or modified content in submodules) # modified: dir/file1.cpp #