Part 4 - Reverting

Dedicated to situations where you feel like Oops I messed up

Fundamentals

git reset --hard <old-commit-id>

git push -f <remote-name> <branch-name>

You might end up having a time if the remote-branch-name and your current-branch-name are not attached.

git commit --amend

You can simply edit the commit messages without altering the commit messages. But what this command seems to Git would look more like a brand new commit,

since it’s not editing the original commit but more so replacing it with a new commit.

git reset --soft

git rebasing

Interested in rewriting history?

First, make sure you understand the consequences of using the command. This command enables a process of reconnecting the snapshots, allowing one commit’s patch to go ahead of another commit. Instead of merging, this would seem more like reconnecting.

---

Additional

Links

• Atlassin git amend
• Merging versus Rebasing

Notes

1. When prompted with error: src refspec branch does not match any One solution is to use

   git push origin HEAD --force

   instead of the original second line.

2. A real-world scenario for using rebasing might be to have a “clean history”, when you have multiple people working on the same project, you might want to arrange

their commits to show features added or parts revised.