You can use git checkout — file You can do it without the — (as suggested by nimrodm), but if the filename looks like a branch or tag (or other revision identifier), it may get confused, so using — is best. You can also check out a particular version of a file: git checkout v1.2.3 … Read more
From linux symlink manual (assuming you are in Linux): A symbolic link is a special type of file whose contents are a string that is the pathname of another file, the file to which the link refers. (The contents of a symbolic link can be read using readlink(2).) So a symbolic link is one more … Read more
The problem with the other two answers is that the new master doesn’t have the old master as an ancestor, so when you push it, everyone else will get messed up. This is what you want to do: git checkout better_branch git merge –strategy=ours master # keep the content of this branch, but record a … Read more
git diff can show you the difference between two commits: git diff mybranch master — myfile.cs Or, equivalently: git diff mybranch..master — myfile.cs Note you must specify the relative path to the file. So if the file were in the src directory, you’d say src/myfile.cs instead of myfile.cs. Using the latter syntax, if either side … Read more
Just calling git rm –cached on each of the files you want to remove from revision control should be fine. As long as your local ignore patterns are correct you won’t see these files included in the output of git status. Note that this solution removes the files from the repository, so all developers would … Read more
You should be able to use the “ours” merge strategy to overwrite master with seotweaks like this: git checkout seotweaks git merge -s ours master git checkout master git merge seotweaks The result should be your master is now essentially seotweaks. (-s ours is short for –strategy=ours) From the docs about the ‘ours’ strategy: This … Read more
If you want to merge project-a into project-b: cd path/to/project-b git remote add project-a /path/to/project-a git fetch project-a –tags git merge –allow-unrelated-histories project-a/master # or whichever branch you want to merge git remote remove project-a Taken from: git merge different repositories? This method worked pretty well for me, it’s shorter and in my opinion a … Read more
Did You Start ssh-agent? You might need to start ssh-agent before you run the ssh-add command: eval `ssh-agent -s` ssh-add Note that this will start the agent for msysgit Bash on Windows. If you’re using a different shell or operating system, you might need to use a variant of the command, such as those listed … Read more
I think other answers here are wrong, because this is a question of moving the mistakenly committed files back to the staging area from the previous commit, without cancelling the changes done to them. This can be done like Paritosh Singh suggested: git reset –soft HEAD^ or git reset –soft HEAD~1 Then reset the unwanted … Read more
Since Git 1.7.9 (released 2012), there is a neat mechanism in Git to avoid having to type your password all the time for HTTP / HTTPS, called credential helpers. You can just use one of the following credential helpers: git config –global credential.helper cache The credential.helper cache value tells Git to keep your password cached … Read more