git-stash

问题 I've been advised to avoid git pull --autostash, and instead use: git alias.pull-autostash '!git stash push && git pull --rebase && git stash pop' When there are no changes in the index or working tree, doing: $ git stash push gives: No local changes to save An additional problem is that the exit status is 0 . Any stash pop would then pop something which wasn't pushed. How do I force an empty stash to be created, like git commit --allow-empty ? 回答1: For scripting, use git stash create (which

问题 I've been advised to avoid git pull --autostash, and instead use: git alias.pull-autostash '!git stash push && git pull --rebase && git stash pop' When there are no changes in the index or working tree, doing: $ git stash push gives: No local changes to save An additional problem is that the exit status is 0 . Any stash pop would then pop something which wasn't pushed. How do I force an empty stash to be created, like git commit --allow-empty ? 回答1: For scripting, use git stash create (which

问题 I'm on a branch with some changes. Changing branch is a pain as some files are locked by processes, so to change branch I'd have to stop all the processes which have locks, then stash the changes before checking out the other branch to see its log. Is it possible to view the log for a different branch, without having to check it out? 回答1: TL; DR Use git log <branch> where <branch> is the name of the branch of interest. From the git-log man-page... A simplified version of the git-log synopsis

问题 I am new to Jenkins, I am trying to create a Jenkins job using web client. It shows following error: Failed to connect to repository : Command "git ls-remote -h https://user.name@atlstash.corp.bayadv/scm/qa/qa-auto-framework-selenium.git HEAD" returned status code 128: stdout: stderr: error: while accessing https://user.name@atlstash.corp.bayadv/scm/qa/qa-auto-framework-selenium.git/info/refs fatal: HTTP request failed My STASH URL : https://user.name@atlstash.corp.bayadv/scm/qa/qa-auto

问题 I have a file, let's say file.txt I have done git mv file.txt to file1.txt, then I created a new file called file.txt and worked on it. Unfortunately I didn't add that file to git yet. Anyway the problem is that I did git stash, then git stash apply, but the new file.txt disappeared... anyway to get it back? 回答1: The problem here is mostly a misunderstanding of what git stash save does. It saves only changes to tracked files. Untracked files are not saved by git stash . When you moved file

问题 I'm trying to do a "git stash pop" with a binary file. It results in a merge conflict. I just want to pull what's in the stash off and overwrite what's in the working directory. What is the easiest way to do that? 回答1: To restore all files to their stashed version: $ git checkout stash -- . 来源： https://stackoverflow.com/questions/29979038/git-stash-pop-with-binary-merge-conflict

问题 How do I drop oldest stashes (say oldest 5 stashes) in one statement instead of doing something like this: git stash drop stash@{3} git stash drop stash@{4} git stash drop stash@{5} git stash drop stash@{6} git stash drop stash@{7} 回答1: Thanks to an anonymous user's edit, the correct command would look like this: git stash list | cut -f 1 -d : | tail -5 | sort -r | xargs -n 1 git stash drop Here's his/her explanations: git stash list : List all your stashes cut -f 1 -d : Select only the first

问题 A co-worker and I are both working on the master branch at the moment. I have some code in my working tree that I don't want to commit (debugging statements and the like). Now if he commits changes to some of those same files, I can't merge them: $ git merge origin/master Updating 1b8c5c6..eb44c23 error: Entry 'blah.java' not uptodate. Cannot merge. Coming from a subversion background, I'm used to having my working tree automatically merged when I pull changes from the repository and if there

问题 I am new to Git and I am using EGit eclipse plugin to commit. I modified few files and I stashed the changes, then I did git pull in command line which pulled up all the latest commits. Then I did Apply stashed changes from EGit. Now it applied my changes and the changes which pulled from last commit of stashed files went out. I am not sure why it didn't ask me about merge conflicts and overwrote my changes and lost previous commits changes. How to get those changes? 回答1: When you have

问题 Question: I have a couple of edited files as listed below, and also I have some newly created files Now I want to stash the untracked file (in this case, it's db/migrate/20161212071336_add_paranoid_fields.rb , but not stash the changed files). How should I do that? Why I want to stash a single untracked file I created this file at first, and then I realised that I don't need it immediately (it needs to be deleted in order for my program to work correctly); but I might need it in future. What