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
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
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
The easiest way would be to find the head commit of the branch as it was immediately before the rebase started in the reflog… git reflog and to reset the current branch to it (with the usual caveats about being absolutely sure before reseting with the –hard option). Suppose the old commit was HEAD@{2} in … Read more
Undo a Git merge that hasn’t been pushed yet
Setting your branch to exactly match the remote branch can be done in two steps: git fetch origin git reset –hard origin/master If you want to save your current branch’s state before doing this (just in case), you can do: git commit -a -m “Saving my work, just in case” git branch my-saved-work Now your … Read more
You can undo git add before commit with git reset <file> which will remove it from the current index (the “about to be committed” list) without changing anything else. You can use git reset without any file name to unstage all due changes. This can come in handy when there are too many files to … Read more