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
git reset –hard origin/master will remove all commits not in origin/master where origin is the repo name and master is the name of the branch.
origin/xxx branches are always pointer to a remote. You cannot check them out as they’re not pointer to your local repository (you only checkout the commit. That’s why you won’t see the name written in the command line interface branch marker, only the commit hash). What you need to do to update the remote is … Read more
git reset –hard origin/master says: throw away all my staged and unstaged changes, forget everything on my current local branch and make it exactly the same as origin/master. You probably wanted to ask this before you ran the command. The destructive nature is hinted at by using the same words as in “hard reset”.
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
I had the same problem and it was related to the .gitattributes file. However the file type that caused the problem was not specified in the .gitattributes. I was able to solve the issue by simply running git rm .gitattributes git add -A git reset –hard
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
You did it the wrong way around. You are meant to reset first, to unstage the file, then checkout, to revert local changes. Try this: $ git reset foo/bar.txt $ git checkout foo/bar.txt
git reset is specifically about updating the index, moving the HEAD. git checkout is about updating the working tree (to the index or the specified tree). It will update the HEAD only if you checkout a branch (if not, you end up with a detached HEAD). (actually, with Git 2.23 Q3 2019, this will be … Read more