git-stash

问题 On git version 1.7.9.5, when trying git stash show -p stash@{"Friday Smarch 13 13:13:13 2013"} (from Is it possible to choose a git stash when they're described by the date stashed? ) I get the error message Too many revisions specified: stash@{Friday Smarch 13 13:13:13 2013} I also get the same error message when trying the following git stash show "stash@{Friday Smarch 13 13:13:13 2013}" git stash show -p stash@{Friday\ Smarch\ 13\ 13:13:13\ 2013} I don't think escaping is the cause. If I

问题 I ♥ git stash -p . But sometimes, after a satisfying session of y , n , and s , I get this: Saved working directory and index state WIP on foo: 9794c1a lorum ipsum error: patch failed: spec/models/thing_spec.rb:65 error: spec/models/thing_spec.rb: patch does not apply Cannot remove worktree changes Why? 回答1: git stash -p should fail less with Git 2.17 (Q2 2018). Before that, " git add -p " (which shares logic with git stash ) has been lazy in coalescing split patches before passing the result

问题 I popped a stash and there was a merge conflict. Unlike the question that is listed as a duplicate, I already had some uncommitted changes in the directory which I wanted to keep. I don't just want to make the merge conflict disappear, but also to get my directory back to the state it was before the pop. I tried git merge --abort , but git claimed no merge was in progress. Is there an easy way to abort a pop without destroying the changes I originally had in the directory? 回答1: Ok, I think I

问题 I have been using Merging heavily on master branch. But recently for a feature development in my situation merging seemed complicated for the project history. I came across Rebasing which solves my problem. I also came across the golden rule of rebasing while solving the problem. I also used Stashing at times, it worked, but I feel like the same thing could have been achieved with merging as well. Although I use these commands, I feel like if someone can explain the conceptually outstanding

问题 I have my local repo in a state that forbid me to either commit, stash, checkout to another branch or even discard changes . So I'm just stuck. I will try to describe what steps brought me to this situation, as far as I remember. Please, take a seat. A not so long time ago, in another computer far, far away... an other dev normalized crlf in the project according to: https://help.github.com/articles/dealing-with-line-endings In the while (you know, speed of light...) I made some changes

问题 Git pull command is working fine, but git stash is giving the following error: $git stash error: unable to resolve reference refs/stash: No such file or directory fatal: Cannot lock the ref 'refs/stash'. Cannot save the current status How do i resolve this so that i don't loose my changes? 回答1: I was having a very similar issue, after a corrupted filesystem. The solution was to remove the file or directory at .git/logs/refs/stash After delete the file or directory, plase use git stash to

问题 I did a git stash pop and ended up with merge conflicts. I removed the files from the file system and did a git checkout as shown below, but it thinks the files are still unmerged. I then tried replacing the files and doing a git checkout again and same result. I event tried forcing it with -f flag. Any help would be appreciated! chirag-patels-macbook-pro:haloror patelc75$ git status app/views/layouts/_choose_patient.html.erb: needs merge app/views/layouts/_links.html.erb: needs merge # On

问题 A colleague has a stash in their repository which I can access (via the filesystem), and I'd like to pull that stash into a branch in my repository. % git ls-remote ~alice/work/repo/ stash 3ccc82fb1ee0e7bde1250c7926d333ce21c109c0 refs/stash But when I try to fetch that, git tells me "unable to find 3cc82..." % git fetch ~alice/work/repo stash:new_branch remote: Total 0 (delta 0), reused 0 (delta 0) error: unable to find 3ccc82fb1ee0e7bde1250c7926d333ce21c109c0 fatal: object

问题 A colleague has a stash in their repository which I can access (via the filesystem), and I'd like to pull that stash into a branch in my repository. % git ls-remote ~alice/work/repo/ stash 3ccc82fb1ee0e7bde1250c7926d333ce21c109c0 refs/stash But when I try to fetch that, git tells me "unable to find 3cc82..." % git fetch ~alice/work/repo stash:new_branch remote: Total 0 (delta 0), reused 0 (delta 0) error: unable to find 3ccc82fb1ee0e7bde1250c7926d333ce21c109c0 fatal: object

问题 How can I stash only one of multiple changed files on my branch? 回答1: Update : the following answer is for git before git 2.13. For git 2.13 and over, check out another answer further down. 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