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
- git commit signing failed: secret key not available
- VS Code not recognizing that I have user name and email set for git
- gpg failed to sign the data fatal: failed to write commit object [Git 2.10.0]
- Git clone stuck from Jenkins pipeline
- How can I get a list of Git branches, ordered by most recent commit?
- Should Gemfile.lock be included in .gitignore?
- How to solve "Unable to find git in your PATH" on Flutter?
- Can I make git recognize a UTF-16 file as text?
- How do I undo the most recent local commits in Git?
- What are the consequences of making `develop` the default branch on GitHub?
- Why can't my github app bypass branch protection
- How can I solve "fatal: Invalid credentials" error when pushing to Bitbucket?
- Sonarqube: Missing blame information for the following files
- How do I delete a Git branch locally and remotely?
- Why is git log significantly slower when outputting to a tty?
- How to fix "ssh: connect to host github.com port 22: Connection timed out" for git push/pull/... commands?
- Git corrupted? `reword` of `git rebase -i` suddenly stopped working
- Referring to the branch of the current working directory with unstaged changes as a branch
- How to cherry pick from 1 branch to another
- Git fatal: protocol 'https' is not supported
- Retrieve specific commit from a remote Git repository
- MacOS Monterey and Android Studio Bumblebee, "Git is not installed"
- Squash all my commits into one for GitHub pull request
- Cannot ignore .idea/workspace.xml - keeps popping up
- What is the proper way to generate, store, and configure an SSH public/private key pair for git repository usage on Assembla?
- How to show git log with commit numbers?
- Git: how can I retrieve all branches that are protected?
- How can I filter the results of 'git fsck --unreachable'
- How to squash all git commits into one?
- What does it mean to squash commits in git?