I think you may have the wrong Git repository URL. Open .git/config and find the [remote “origin”] section. Make sure you’re using the SSH one: ssh://git@github.com/username/repo.git You can see the SSH URL in the main page of your repository if you click Clone or download and choose ssh. And NOT the https or git one: … Read more
git reset –hard <tag/branch/commit id> Notes: git reset without the –hard option resets the commit history, but not the files. With the –hard option the files in working tree are also reset. (credited user) If you wish to commit that state so that the remote repository also points to the rolled back commit do: git … Read more
I think the problem you’re having is that in some earlier commit, you’ve accidentally added .DS_Store files to the repository. Of course, once a file is tracked in your repository, it will continue to be tracked even if it matches an entry in an applicable .gitignore file. You have to manually remove the .DS_Store files … Read more
Notes: xiaobai’s answer is simpler (git1.7.6+): git status –ignored (as detailed in “Is there a way to tell git-status to ignore the effects of .gitignore files?”) MattDiPasquale’s answer (to be upvoted) git clean -ndX works on older gits, displaying a preview of what ignored files could be removed (without removing anything) Also interesting (mentioned in … Read more
In its default mode, git pull is shorthand for git fetch followed by git merge FETCH_HEAD. When you do a git pull origin master, git pull performs a merge, which often creates a merge commit. Therefore, by default, pulling from the remote is not a harmless operation: it can create a new commit SHA hash … Read more
I actually once pushed with –force and .git repository and got scolded by Linus BIG TIME. In general this will create a lot of problems for other people. A simple answer is “Don’t do it”. I see others gave the recipe for doing so anyway, so I won’t repeat them here. But here is a … Read more
Git detects renames rather than persisting the operation with the commit, so whether you use git mv or mv doesn’t matter. The log command takes a –follow argument that continues history before a rename operation, i.e., it searches for similar content using heuristics. To lookup the full history, use the following command: git log –follow … Read more
This should work: git show branch:file Where branch can be any ref (branch, tag, HEAD, …) and file is the full path of the file. To export it you could use git show branch:file > exported_file You should also look at VonC’s answers to some related questions: How to retrieve a single file from specific … Read more
The normal way to control this is with git config For example git config –global core.autocrlf true For details, scroll down in this link to Pro Git to the section named “core.autocrlf” If you want to know what file this is saved in, you can run the command: git config –global –edit and the git … Read more
If you want remove all local changes – including files that are untracked by git – from your working copy, simply stash them: git stash push –include-untracked If you don’t need them anymore, you now can drop that stash: git stash drop If you don’t want to stash changes that you already staged – e.g. … Read more