Git: abandon bad commit and make HEAD the mainstream
I made some changes to this repository and checked them in and pushed (4326b5, "Waypoint"), before falling back to the previous well behaved commit, 64b7d01 "Merge commit". Then I made some changes from that point and they solved a lot of bugs I had been having. Not going to let that get lost! Now, how to untangle the mess?
Scenario one: yesterday. I had a bunch of changes that I wanted to keep, and I had HEAD at "merge commit". What I really wanted to do was abandon "waypoint" and set master pointing to "merge commit". Reading online it seemed that the advice was to git reset --soft HEAD. However, this accomplished absolutely nothing. What was the right way to do that?
Scenario two: today. Rather than risk my valuable changes, I went ahead and did a commit on the detached head. Now, nearly the same question: how can I get master and origin/master both pointing to bc35e77 "Correctly reports" and abandon "Waypoint" as a detached head or irrelevant branch or something of the sort?
If you have push permissions on the master branch remote repo, then you can do the following:
- Save your HEAD state by creating a branch at it.
git branch newfix - Switch to the local master branch
git checkout master. - Reset master to newfix.
git reset --hard newfix. - Push master (You'll lose the "Waypoint" state)
git push --force
- Rename file for all commits in a Git repository
- git pull and resolve conflicts
- How to substitute text from files in git history?
- Define git alias with the same name to shadow original command
- Specify extras_require with pip install -e
- How do I rebase my PR without adding commits to it?
- Merge git repo into branch of another repo
- How to correct `git` reporting `detected dubious ownership in repository` without adding `safe.directory` when using WSL?
- Trouble setting up git with my GitHub Account error: could not lock config file
- In a Git repository, how to properly rename a directory?
- Git submodule push
- send-pack: unexpected disconnect while reading sideband packet when pushing to local git server
- Gerrit: configure similarity index threshold (renamed file)
- Git double revert : How to keep original author?
- Gitignore not working
- git submodule deinit not working as expected after submodule url change
- How can I find/identify large commits in Git history?
- How to fix : failed to push some refs to gitlab?
- Gitlab: webhook event on create branch
- Using "x AND y" instead of "x OR y" when using --grep twice in git-log
- Issues with commit message when pre-commit hook changes files
- Unstaged changes left after git reset --hard
- How to clone only a folder from a git submodule?
- How do I checkout a branch ignoring all local changes?
- Include only tracked files with npm publish
- Prevent Pull Request builds from triggering Continuous deployment trigger Azure DevOps Server
- Heroku/Git: protocol error: bad line length character: erro
- Add all files to a commit except a single file?
- Git Bash is extremely slow on Windows 7 x64
- How to delete a git working tree branch when its working directory has been removed?