By default git revert refuses to revert a merge commit as what that actually means is ambiguous. I presume that your HEAD is in fact a merge commit. If you want to revert the merge commit, you have to specify which parent of the merge you want to consider to be the main trunk, i.e. … Read more
I think you haven’t messed up yet. Try: git reset HEAD^ This will bring the dir to state before you’ve made the commit, HEAD^ means the parent of the current commit (the one you don’t want anymore), while keeping changes from it (unstaged).
Before answering, let’s add some background, explaining what this HEAD is. First of all what is HEAD? HEAD is simply a reference to the current commit (latest) on the current branch. There can only be a single HEAD at any given time (excluding git worktree). The content of HEAD is stored inside .git/HEAD and it … Read more
You have to “revert the revert”. Depending on you how did the original revert, it may not be as easy as it sounds. Look at the official document on this topic. —o—o—o—M—x—x—W—x—Y / —A—B——————-C—D to allow: —o—o—o—M—x—x——-x——-* / / —A—B——————-C—D But does it all work? Sure it does. You can revert a merge, and from … Read more
You don’t want git revert. That undoes a previous commit. You want git checkout to get git’s version of the file from master. git checkout — filename.txt In general, when you want to perform a git operation on a single file, use — filename. git-checkout Documentation git-revert Documentation 2020 Update Git introduced a new command … Read more
These three commands have entirely different purposes. They are not even remotely similar. git revert This command creates a new commit that undoes the changes from a previous commit. This command adds new history to the project (it doesn’t modify existing history). git checkout This command checks-out content from the repository and puts it in … Read more
First, reset any changes This will undo any changes you’ve made to tracked files and restore deleted files: git reset HEAD –hard Second, remove new files This will delete any new files that were added since the last commit: git clean -fd Files that are not tracked due to .gitignore are preserved; they will not … Read more
First, it’s always worth noting that git reset –hard is a potentially dangerous command, since it throws away all your uncommitted changes. For safety, you should always check that the output of git status is clean (that is, empty) before using it. Initially you say the following: So I know that Git tracks changes I … Read more
Try this: git checkout [revision] . where [revision] is the commit hash (for example: 12345678901234567890123456789012345678ab). Don’t forget the . at the end, very important. This will apply changes to the whole tree. You should execute this command in the git project root. If you are in any sub directory, then this command only changes the … Read more
Identify the hash of the commit, using git log, then use git revert <commit> to create a new commit that removes these changes. In a way, git revert is the converse of git cherry-pick — the latter applies the patch to a branch that’s missing it, the former removes it from a branch that has … Read more