git-stash

问题 Stashing content in git is very useful. when stashing untrack files and going through your stash like this echo test > foo git stash -u # foo is stashed git stash show -p stash@{0} untracked files are not shown. how can we see them? thanks 回答1: You just need to look at the third stash commit. But "just need to" understates things a little bit, and this makes no sense until you know what the three stash commits are . To see what I mean, read on. Setup: what to know about stashes When you run

问题 Is it possible to tell whether a stash has already been applied, and therefore is no longer required, without doing git stash apply ? Assume that I'm only using one branch. This could be prevented by using pop rather than apply when applying a stash, and therefore get rid of the stash each time it gets applied. However, I sometimes use git stash to keep a snapshot of work in progress, rather than only using it to switch from one task to another. Using pop would defeat that somewhat. 回答1: Just

问题 I generally like the use of the pager in git, but for git stash the pager annoys me. When calling git stash list , I don't want to be shown the three lines of output in the pager -- it forces me to press q just to make the output unavailable again when typing the folow-up git stash pop command. One solution would be to use git --no-pager stash list but that's to much typing (I'm lazy). Following the man page of git config, I tried git config --global pager.stash false but this doesn't seem to

问题 I'm new to Git and a bit confused. I have a Master branch and have created a second feature branch. If I make changes in my feature branch and then switch to Master, will my changes be lost if I don't commit? Where does stash come into play, is it something you do before you switch branches (but don't want to commit) or is it to simply revert some changes so you can get back to previous code temporarily? 回答1: You can't change to another branch unless you clean your tree. This is done by

问题 Git merging code Let us say I have a branch called origin/develop , Everytime I work on a new feature I create a new branch from origin/develop as feature/feature_name Let us say that I am working on the feature for a few days , I made some changes and also commited them to the remote feature/feature_name brach Now Let us say that the origin/develop itself was changed meanwhile becuase some other developers commiting to it through pull requests. If i create a pull request now to merge the

问题 I would rather make temporary commits than use the git stash. More importantly, I would prefer my colleauges with less experience with git avoid the stash. Is there a way to disable the git stash so that commands that interact with it terminate with an error? EDIT: Thanks for the answers suggesting what I can do instead, but what I am really looking for is a "yes" or "no" answer, if possible with some justification, to the literal question. 回答1: Replace it with a script: cd /usr/lib/git-core

问题 I have the master branch on which I stashed multiple changes and now I want to create a new branch from the stashed changes which are at {0}. But I doubt that creation of the new branch will not affect my other stashes, because git will drop my stash after creation of the new branch. Will git only drop stashes at {0} index or will it drop all of the stashes? The stashed changes are too IMP for me. 回答1: Short answer : No worries, stash entries are independent from one another. Go for it. Case

问题 I was in the middle of a major change in my Git repo and realized that some of the changes needed to be backported to a bugfix branch. I don't want to check in all of my changes to master because they're not fully tested and ready, but I do want to pull a few of these changes out and commit them to the bugfix branch, then return to master with my index as it was. How can I avoid committing all my changes to master but still commit some of these changes to my bugfix branch? 回答1: It took me a

问题 My design (html/css) changed/gone awry after I popped back stashed repo. Here is what I did. In order to temporary try out something, I did a git stash Then, checked onto an earlier commit git checkout fd3243d but did not make any changes. Immediately did git stash pop . Now, to my horror (that sinking feeling), when I refreshed design in browser it went totally awry and on the very top it reads <<<<<<< Updated upstream ======= >>>>>>> Stashed changes <<<<<<< Updated upstream ======= >>>>>>>

问题 I'm getting some odd behavior when trying to stash changes. I'm not a git expert so I'm hoping someone can shed some light on this: On an up-to-date branch, I modify a tracked file. git status shows it as modified git stash (responds with "Saved working directory and index state WIP on...) git status still shows the file as modified, but git diff (and git gui) show no changes. git stash list shows the stash was created git stash pop responds with "error: Your local changes to the following