Fossil, Git, and possibly other revision control systems share the idea of a stash. Pro Git has a section on stashing. It says, in part: Stashing takes the dirty state of your working directory — that is, your modified tracked files and staged changes — and saves it on a stack of unfinished changes that you can reapply at any time In other words, it's a way to save your current work …

How do I save/apply a stash with a name? I don't want to have to look up its index number in git stash list. I tried git stash save "my_stash_name", but that only changes the stash description, and the corresponding git apply "my_stash_name" doesn't work.

2009年5月7日 · git stash --include-untracked Alternatively, you can use the shorthand -u instead of --include-untracked, or simply git stash --all (see warning below for this one) which stashes all files, including untracked and ignored files. This behaviour changed in 2018, so make sure your git is up to date.

2024年6月2日 · $ 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.

2018年5月25日 · I had some uncommitted changes in my development branch and I stashed them using git stash, but there were some changes which were very important among those stashed ones. Is there any way to get b...

I'm trying to figure out how to stash two specific files among many uncommitted changes. This very promising answer, Stash only one file out of multiple files that have changed with Git?, doesn'...

The keys into the stash are actually the stash@{n} items on the left. So try: git stash apply stash@{0} (note that in some shells you need to quote "stash@{0}", like zsh, fish and powershell). Since version 2.11, it's pretty easy, you can use the N stack number instead of using stash@{n}. So now instead of using: git stash apply "stash@{n}" You can type: git stash apply n To get list …

2013年3月7日 · 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.

Take a look at the question how can I git stash a specific file? but it also sounds like in your case you could git add the files with changes you want to keep and then git checkout -- . and then unstage the added files at the end if you want to.

2012年5月9日 · It sounds like your stash included an untracked file that was subsequently added to the repo. When you try and check it out, git rightly refuses because it would be overwriting an existing file. To fix, you could do something like deleting that file (it's okay, it's still in the repo), applying your stash, and then replacing the stashed version of the file with the in-repo version …