I spent hours trying to solve a similar issue – a remote branch that I had checked out, which stubbornly showed four files as ‘Changed but not updated’, even when deleting all files and running git checkout -f again (or other variations from this post)! These four files were necessary, but certainly hadn’t been modified … Read more
There is a solution… go to your recycle bin you’ll find there the latest version of the deleted file. Tortoise “throwing” to the recycle bin every file that it revert.
Git tags are just pointers to the commit. So you use them the same way as you do HEAD, branch names or commit sha hashes. You can use tags with any git command that accepts commit/revision arguments. You can try it with git rev-parse tagname to display the commit it points to. In your case … Read more
This has been bothering me for a while, almost every repo I’d check out had changes that I couldn’t discard. Long story short, I tried all of the above, nothing worked. This is what I did to get things back to normal (on a Mac): Completely remove the autocrlf & safecrlf settings from ~/.gitconfig Completely … Read more
What version of Git are you using? Reverting multiple commits in only supported in Git1.7.2+: see “Rollback to an old commit using revert multiple times.” for more details. The current git revert man page is only for the current Git version (1.7.4+). As the OP Alex Spurling reports in the comments: Upgrading to 1.7.4 works … Read more
There are three basic ways to do this depending on what you have done with the changes to the file A. If you have not yet added the changes to the index or committed them, then you just want to use the checkout command – this will change the state of the working copy to … Read more
The cleanest way I’ve seen of doing this is described here git show some_commit_sha1 — some_file.c | git apply -R Similar to VonC’s response but using git show and git apply.
If you just want the old file in your working copy: svn up -r 147 myfile.py If you want to rollback, see this “How to return to an older version of our code in subversion?”.
Here’s the cheat sheet on the commands: hg update changes your working copy parent revision and also changes the file content to match this new parent revision. This means that new commits will carry on from the revision you update to. hg revert changes the file content only and leaves the working copy parent revision … Read more
I was having this problem on Windows but wasn’t prepared to look into the ramifications of using config –global core.autocrlf false I also wasn’t prepared to abandon other private branches and goodies in my stash and start with a fresh clone. I just need to get something done. Now. This worked for me, on the … Read more