git-stash | 易学教程

How to recover stashed uncommitted changes

阅读更多关于 How to recover stashed uncommitted changes

问题 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 back those changes? Also, I have made some changes on top of the stashed code files since. Is there any chance I can retrieve the stashed changes to a new branch if possible? 回答1: The easy answer to the easy question is git stash apply Just check out the branch you want your changes on, and then git

Git: Create a branch from unstaged/uncommitted changes on master

阅读更多关于 Git: Create a branch from unstaged/uncommitted changes on master

问题 Context: I\'m working on master adding a simple feature. After a few minutes I realize it was not so simple and it should have been better to work into a new branch. This always happens to me and I have no idea how to switch to another branch and take all these uncommited changes with me leaving the master branch clean. I supposed git stash && git stash branch new_branch would simply accomplish that but this is what I get: ~/test $ git status # On branch master nothing to commit (working

Git diff against a stash

阅读更多关于 Git diff against a stash

问题 How can I see the changes un-stashing will make to the current working tree? I would like to know what changes will be made before applying them! 回答1: See the most recent stash: git stash show -p See an arbitrary stash: git stash show -p stash@{1} From the git stash manpages: By default, the command shows the diffstat, but it will accept any format known to git diff (e.g., git stash show -p stash@{1} to view the second most recent stash in patch form). 回答2: To see the most recent stash: git

How to reverse apply a stash?

阅读更多关于 How to reverse apply a stash?

问题 I have a small patch saved away in my git stash. I\'ve applied it to my working copy using git stash apply . Now, I\'d like to back out those changes by reverse applying the patch (kind of like what git revert would do but against the stash). Does anyone know how to do this? Clarification: There are other changes in my working copy. My particular case is hard to describe but you can imagine some debugging or experimental code that\'s in the stash. Now it\'s mixed in my working copy with some

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

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

问题 This question already has answers here : Closed 6 years ago . 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 \

Is it possible to get commit logs/messages of a remote git repo without git clone

阅读更多关于 Is it possible to get commit logs/messages of a remote git repo without git clone

问题 Is it possible to get commit logs/messages of a remote git repo without git clone? The git repo I am working with is huge, even if I run git clone with --depth=1 still takes sometime before I am able to clone it. I am looking for something like this, git remote-log . I have also looked in to git -ls-remote, which only provides the SHA and the Heads/tags. I am interested in getting the last 2 commit title, commit user and commit SHA? Anyone know how to do that? 回答1: If you are looking to see

git stash and apply

阅读更多关于 git stash and apply

I'm new to git and not quite clear on how stashing works. Let's say I'm working on branch master and try to git pull and receive the error that my local changes would be overwritten and need to be stashed or committed. If I haven't staged any of my changes and run git stash , then do a git pull and and update successfully, what happens when I git stash apply ? In general, If someone else modifies files and I run git pull , what happens when I run git stash apply ? does it overwrite the files that were just updated, regardless of whether or not they were staged when I stashed them? Does it

How do you stash an untracked file?

阅读更多关于 How do you stash an untracked file?

问题 I have changes to a file, plus a new file, and would like to use git stash to put them away while I switch to another task. But git stash by itself stashes only the changes to the existing file; the new file remains in my working tree, cluttering up my future work. How do I stash this untracked file? 回答1: To stash your working directory including untracked files (especially those that are in the .gitignore) then you probably want to use this cmd: git stash --include-untracked More details:

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

阅读更多关于 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. To be clear, I only want to overwrite specific changes, not everything. 回答1: If you want remove all local changes from your working copy, simply stash them: git stash save --keep-index If you don't need them anymore, you now can drop that stash: git stash drop If you want to

Is it possible to push a git stash to a remote repository?

阅读更多关于 Is it possible to push a git stash to a remote repository?

问题 In git, is it possible to create a stash, push the stash to a remote repository, retrieve the stash on another computer, and apply the stash? Or are my options: Create a patch and copy the patch to the other computer, or Create a minor branch and commit the incomplete work to that branch? 回答1: It's not possible to get it via fetch or so, the mirror refspec is fetch = +refs/*:refs/* , and even though stash is refs/stash it doesn't get sent. An explicit refs/stash:refs/stash has no effect