git-checkout

问题 Simple example. This is 'master': root - index.html - readme.md This is a branch called 'dev': root src - index.jade dist - index.html I'd like to take the index.html file (or all files, really) in the 'dist' folder of the 'dev' branch and replace or merge it with the one in the root directory of my master branch. I've tried, from master: git checkout dev dist/ But it produces this result: root dist - index.html - index.html Clearly not what I want. Is git capable of doing what I want it to

问题 I use git checkout --<dir_name(or)file_name> to discard all my changes in the specific directory or in the file. Whenever I do that, GIT checks-out the directory (or) file from the repository. Is there a way I can tell GIT?, " do not override the changes, just tell me what would happen. " Similar to git clean -n (or) git clean --dry-run . UPDATE: Before I execute, git checkout --src/ , I would like to see what are the files would be overridden. I know we can use git status src/ . But, wouldn

问题 Problem: I need somehow to checkout an existing branch of a project that is already cloned locally on my file system without being in that particular folder of this project. Solution: I'm trying to do the following: git clone 'github-project-url' 'file-system-folder' git checkout 'existing-branch' 'file-system-folder' I do realize that second step is not quite right, but I also am trying to avoid to "cd 'file-system-folder'". 回答1: You can use --git-dir to specify the .git directory to use as

问题 I want to provide a git tag to the TeamCity server to build it. I pass the tag (i.e. release_1.1 ) as a parameter to the job. So inside the job the tag is available as %tag% , but under the Version Control Settings I don't see any way to use this parameter so the server can checkout this tag. Is there any way this parameter can be used in the settings to checkout the tag? 回答1: Go to Edit Configuration Settings -> Version Control Settings For all your VCS roots for this build configuration

问题 I am on my local my-feature branch git status reports nothing to commit, working tree clean I want to switch to develop branch and do git fetch and git merge there (I prefer it over git pull ) However, doing so produces error below Here I first check status and it shows that all is clean mymbp:MyProj username$ git status On branch my-feature nothing to commit, working tree clean Next I try to checkout my develop branch which is an existing local branch On branch my-feature nothing to commit,

问题 Newb question, I want to make sure I understand this. When I git checkout <revision> , does this return the entire project to its state at that moment, or does it only recreate the files changed in that particular revision? For example: If my folder was completely empty besides the .git repo, and I git checkout master , will the resulting files be the project in its entirety, or only the files changed in the most recent commit? I ask, because I am checking out my project at various points

问题 Is there a way to undo the following git command: git checkout -- . I was trying to remove files that were added to the repo directory but not staged or committed. That command didn't seem to do that, instead changing some other files. Update: There's a difference between untracked filed and unstaged files. In this case, I would like to find a way to discard both untracked and unstaged files. When I ran git checkout -- . , I thought it would get rid of untracked files, but it only got rid of

问题 When I first started using Git, I found the checkout command quite confusing. However, as I adapted to Git's model of version control, it started to make sense. Now I am having to teach Git to my coworkers, and I'm trying to explain checkout simply. I thought I had a simple explanation (from the documentation): Checkout a branch or paths to the working tree That seems to unify some of the things you can do with checkout which seem like a diverse set of operations to someone new to Git: git

问题 I created a new Branch before I started dev on something experimental. I usually forget that (which isn't a problem), but now I did it beforehand. Since then I have updated 3 files. In 2 are only experimental changes that I DON'T want committed to the safe branch. In 1 are only safe (minor) changes that I definitely DO want committed to the safe branch. I'm fine with these last changes to be committed to the new branch as well (but rather not). Is it possible - I'm sure it is - to (quickly)

问题 My git repo got corrupted while running a find and replace command (See here: Git reset failing after find and replace). So I deleted some pack files about which git told me that there were not reachable. So I ran rm ./.git/index, git reset. When running git commit, I got this message : fatal: corrupt tree sha $someSHA Finally git fsck, my working directory went clean and I was able to commit. The pb now is that when I run git checkout some_other_branch, I got this message fatal: unable to