git-stash

来源： https://stackoverflow.com/questions/14988929/show-all-stashes-in-git-log

来源： https://stackoverflow.com/questions/14988929/show-all-stashes-in-git-log

来源： https://stackoverflow.com/questions/14988929/show-all-stashes-in-git-log

问题 I was accidentally working on the wrong branch. Now I want to transfer all my changes to the correct branch. If I stash the changes and apply them on the correct branch, will it only add the uncommitted changes to the correct branch or every change/commit from the wrong branch that doesn't exist on the correct branch? For example Wrong branch has: Commit a Uncommitted Changes b Correct branch has Commit c If I do git stash on the wrong branch and git apply stash in the correct branch, will it

问题 I have a lot of files changed in my project. I want to stash 2 files but i'm a bit afraid to make a mistake since i never did this. If i would stash now, will it only stash the 2 staged files? And if I don't mark the "Keep staged changes", will it then revert to how it was before? This might sound stupid, but better save then sorry. 回答1: This applies to Git in general, not just with SourceTree. When you stash changes, the items that will be stashed are the changes to tracked files in your

问题 Intellij has a feature that's very cool in theory, called Smart Checkout. This feature kicks in when you're changing branches and you have files in the current branch that you've modified but haven't committed. Instead of forcing you to commit, stash or shelve your changes, it stashes them for you, switches branches, then runs stash pop in the new branch. I guess this is what you'd want sometimes, but I ran this when switching to the wrong branch. So, now my master branch is all full of

问题 I have a project hosted in Git stash. It is built using jenkins. Now I made a typo while installing my Git locally. Like @ab.com instead of @abc.com After every build, jenkins sends email notifications and it picks up my incorrect email address from Git commit and tries to send it. Even after I have changed the email address in my local Git, I still see jenkins sending the emails to the old incorrect address. How can I fix this? 回答1: Locally set email-address (separately for each repository)

问题 I'd like to do the following work flow: Add changes to the stage. Stash all the other changes that were not staged. Do some stuff with the things in stage (i.e. build, run tests, etc) Apply the stash. Is there a way to do step 2? Example echo "123" > foo git add foo # Assumes this is a git directory echo "456" >> foo git stash cat foo # Should yield 123 回答1: git stash save has an option --keep-index that does exactly what you need. So, run git stash save --keep-index . 回答2: This may be done

问题 Is there a git stash command that stashes your changes, but keeps them in the working directory too? So basically a git stash; git stash apply in one step? 回答1: For what it's worth, another way to do this is to stage the changes you want to keep, and then stash everything using --keep-index : $ git add modified-file.txt $ git stash save --keep-index The commands above will stash everything including modified-file.txt , but it will also leave that file staged and in your working directory.

问题 Is there a git stash command that stashes your changes, but keeps them in the working directory too? So basically a git stash; git stash apply in one step? 回答1: For what it's worth, another way to do this is to stage the changes you want to keep, and then stash everything using --keep-index : $ git add modified-file.txt $ git stash save --keep-index The commands above will stash everything including modified-file.txt , but it will also leave that file staged and in your working directory.