git-stash | 易学教程

In git, is there a way to show untracked stashed files without applying the stash?

阅读更多关于 In git, is there a way to show untracked stashed files without applying the stash?

问题 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? 回答1: 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

How to unstash only certain files?

阅读更多关于 How to unstash only certain files?

问题 I stashed my changes. Now I want to unstash only some files from the stash. How can I do this? 回答1: 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

Difference between git stash pop and git stash apply

阅读更多关于 Difference between git stash pop and git stash apply

问题 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 ? 回答1: 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

How can I git stash a specific file? [duplicate]

阅读更多关于 How can I git stash a specific file? [duplicate]

Possible Duplicate: How to stash only one file out of multiple files that have changed How can I stash a specific file leaving the others currently modified out of the stash I am about to save? For example, if git status gives me this: younker % gst # On branch master # Your branch is ahead of 'origin/master' by 1 commit. # # 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) # # modified: app/controllers/cart_controller.php # modified: app/views/cart/welcome.thtml # no changes

How would I extract a single file (or changes to a file) from a git stash?

阅读更多关于 How would I extract a single file (or changes to a file) from a git stash?

问题 I'd like to know if it is possible to extract a single file or diff of a file from a git stash without popping the stash changeset off. Might anyone be able to provide some suggestions/ideas about this? 回答1: On the git stash manpage you can read (in the "Discussion" section, just after "Options" description) that: A stash is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at HEAD when the stash was created. So you can treat

Is it possible to preview stash contents in git?

阅读更多关于 Is it possible to preview stash contents in git?

问题 I often put work away for later, then other stuff comes along, and a few weeks later, I want to inspect the stash, and find out what changes it would make if I applied it to working tree in its current state. I know I can do a git diff on the stash, but this shows me all the differences between the working tree and the stash, whereas I'm just interested to know what the stash apply is going to change. How can I do this? 回答1: git stash show will show you the files that changed in your most

Is there a way with to prevent “git stash pop” from marking files as modified?

阅读更多关于 Is there a way with to prevent “git stash pop” from marking files as modified?

问题 I implemented a git-hook to scan my commits through pyflakes and jshint, and after reading Yipit\'s commentary on why most pre-commit hooks are broken, I chose to implement his git stash and git stash pop suggestions. Unfortunately, git stash pop marks the files as \'modified\', which then causes my IDE to warn me whenever I go back to that page \" modified on disk. Reread from disk?\" It then asks \"Are you sure you want to edit this buffer?\" and finally \"Are you sure you want to save this

See what's in a stash without applying it [duplicate]

阅读更多关于 See what's in a stash without applying it [duplicate]

问题 Possible Duplicate: Is it possible to preview stash contents in git? 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? 回答1: From the man git-stash page: The modifications stashed away by this command can be listed with git stash list, inspected with git stash show show [<stash>] Show the changes recorded in the stash as a diff between the stashed state and its original

How to name and retrieve a stash by name in git?

阅读更多关于 How to name and retrieve a stash by name in git?

问题 I was always under the impression that you could give a stash a name by doing git stash save stashname , which you could later on apply by doing git stash apply stashname . But it seems that in this case all that happens is that stashname will be used as the stash description. Is there no way to actually name a stash? If not, what would you recommend to achieve equivalent functionality? Essentially I have a small stash which I would periodically like to apply, but don\'t want to always have

Stash only one file out of multiple files that have changed before git 2.13

阅读更多关于 Stash only one file out of multiple files that have changed before git 2.13

How can I stash only one of multiple changed files on my branch? bukzor Update the following answer is for git before git 2.13. For git 2.13 and over, check out How can I git stash a specific file? Warning As noted in the comments, this puts everything into the stash, both staged and unstaged. The --keep-index just leaves the index alone after the stash is done. This can cause merge conflicts when you later pop the stash. This will stash everything that you haven't previously added. Just git add the things you want to keep, then run it. git stash --keep-index For example, if you want to split