You should be able to recover any files back that you added to the index (e.g, as in your situation, with git add .) although it might be a bit of work. In order to add a file to the index, git adds it to the object database, which means it can be recovered so … Read more
1) do svn revert . –recursive 2) parse output for errors like “Failed to revert ‘dir1/dir2’ — try updating instead.” 3) call svn up for each of error directories: svn up dir1/dir2
See also :h undo-redo, which lists all the commands and their usage. There are two ways to traverse the undo tree. One is to go “back in time”. g+ and g- will traverse all of the nodes in the tree in chronological or reverse-chronological order (which can be a bit confusing, because it can jump … Read more
You can use the u button to undo the last modification. (And Ctrl+R to redo it). Read more about it at: http://vim.wikia.com/wiki/Undo_and_Redo
Non-cheeky answer: git mv file2 file1 Updates the index for both old and new paths automatically. Check documentation of git mv
Aha! I simply want: git update-index –no-skip-worktree <file>
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
Or to make it more explicit than the other answer: git pull whoops? git reset –keep HEAD@{1} Versions of git older than 1.7.1 do not have –keep. If you use such version, you could use –hard – but that is a dangerous operation because it loses any local changes. To the commenter ORIG_HEAD is previous … Read more
git cherry-pick <original commit sha> Will make a copy of the original commit, essentially re-applying the commit Reverting the revert will do the same thing, with a messier commit message: git revert <commit sha of the revert> Either of these ways will allow you to git push without overwriting history, because it creates a new … Read more