git-stash

问题 Suppose two set of changes are made in a project versioned by git. One set is staged and the other is not. I would like to recheck staged changes by running my project at this state (before commit). What is a simple way to put away all unstaged changes and leave only staged? So I need unstaged changes to disappear from my project, but to be stored somewhere for further work. This is sounds very much like git stash command. But git stash would put both unstaged and staged changes away from my

问题 Problem with git current commands: Can't easily apply by a saved Stash by Message (message is a secondary param to track stashes more easily rather than index only) Can't remove specific Stash by Message Example: Must apply and revert via Stash's index. git stash push -m "Dev_Configs" git stash list // < Find index. git stash apply 0 And unapply "all" (not specific based on stash) git stash show -p | git apply -R 回答1: git version 2.25.0.windows.1 "HardCoded" WAY Save git stash push -m

问题 I suppose it allows for moving changes from one branch to the next but that's what cherry picking is for and if you're not making a commit of your changes, perhaps you shouldn't be moving them around? I have on occasion applied the wrong stash at the wrong branch, which left me wondering about this question. 回答1: As mentioned, if you want a “per-branch stash,” you really want a new branch forking off from the existing branch. Also, besides the already mentioned fact that the stash allows you

问题 I suppose it allows for moving changes from one branch to the next but that's what cherry picking is for and if you're not making a commit of your changes, perhaps you shouldn't be moving them around? I have on occasion applied the wrong stash at the wrong branch, which left me wondering about this question. 回答1: As mentioned, if you want a “per-branch stash,” you really want a new branch forking off from the existing branch. Also, besides the already mentioned fact that the stash allows you

问题 I'm having a helluva time getting git to cooperate with my user-defined worktree that exists outside the folder that contains my .git directory. Basically the setup is like this: I have two directories, one called "git-worktree" which houses the file I want to track & another called "git-dir" which contains the repository's .git folder aka the GIT_DIR. I init the repository by cd'ing into folder "git-dir" and running: git --git-dir=./.git --work-tree=/Users/braitsch/Test/git-worktree/ init

问题 Is there a way I can stash just my staged changes? The scenario I'm having issues with is when I've worked on several bugs at a given time, and have several unstaged changes. I'd like to be able to stage these files individually, create my .patch files, and stash them away until the code is approved. This way, when it's approved I can stash my entire (current) session, pop that bug and push the code. Am I going about this the wrong way? Am I misunderstanding how git can work in other ways to

问题 I am surprised not having found a response to this question but basically say I have a stash with several files in it (I can explore it through git extension for instance). Looking at its content, I'd like to drop some files before applying it, is it possible ? The only workaround I can think of is: checkout the stash to a new branch checkout the targeted files stash again delete the branch Is there something better ? thanks 回答1: You can directly use stash@{0} as a commit reference. If your

问题 I'm trying to setup a git repository with a manually defined worktree via: cd /Users/braitsch/repos/project1 git --git-dir=. --work-tree=/Users/braitsch/projects/project1 init After running the above I can add files located in "/Users/braitsch/projects/project1" via : git add somefile or git add . Commits work fine as do calls to "git branch" However, git stash list throws the following error: fatal: /usr/local/Cellar/git/1.7.4.4/libexec/git-core/git-stash cannot be used without a working

问题 I'm trying to setup a git repository with a manually defined worktree via: cd /Users/braitsch/repos/project1 git --git-dir=. --work-tree=/Users/braitsch/projects/project1 init After running the above I can add files located in "/Users/braitsch/projects/project1" via : git add somefile or git add . Commits work fine as do calls to "git branch" However, git stash list throws the following error: fatal: /usr/local/Cellar/git/1.7.4.4/libexec/git-core/git-stash cannot be used without a working

问题 I stashed some local changes before doing a complicated merge, did the merge, then stupidly forgot to commit before running git stash pop . The pop created some problems (bad method calls in a big codebase) that are proving hard to track down. I ran git stash show , so I at least know which files were changed. If nothing else, I guess this is a lesson to commit more. My question: is it possible to undo the stash pop without also undoing the merge? 回答1: Try using How to recover a dropped stash