7 Essential Git Tricks to Undo Mistakes and Recover Your Code

1. Amend the most recent commit message

If the latest commit message is wrong and you have no uncommitted changes, rewrite it with: git commit --amend -m "YOUR-NEW-COMMIT-MESSAGE" When the amended commit has already been pushed to a remote repository, update the remote branch with a forced push:

git push origin branch-name --force

2. Undo changes before committing

To unstage a single file that was added with git add: git reset path/to/file To unstage all files that are currently staged:

git reset

3. Undo the most recent commit but keep the changes

Use a soft reset to move HEAD back one commit while leaving the work‑tree unchanged. Then edit, stage, and recommit as needed: git reset --soft HEAD~1 Edit the files in the working directory as required. git add -A Recreate the commit, reusing the original message (or edit it): git commit -c ORIG_HEAD Use -C ORIG_HEAD instead of -c to keep the original message without opening an editor.

4. Checkout a previous commit (detached HEAD) and create a new branch

Identify the commit hash (first 8‑10 characters are sufficient) and check it out: git checkout abcdef12 This puts the repository in a detached HEAD state. To continue work on this point, create a new branch: git checkout -b new-branch-name When you are ready to return to your original branch, simply check it out again:

git checkout original-branch

5. Undo a merge commit

If a merge was performed by mistake, reset the branch to the commit before the merge: git reset --hard HEAD~1 Other strategies (e.g., git revert of the merge commit) are possible, but a hard reset is the most direct way to discard the merge entirely.

6. Remove untracked files and directories

Use git clean with appropriate options. It is recommended to preview the deletion first:

git clean -n -f

git clean -f

git clean -fd

git clean -fX

git clean -fx

7. Delete local and remote branches

Delete a local branch forcefully (useful when the branch has unmerged commits): git branch --delete --force branch-name Or the short form: git branch -D branch-name Delete a branch on the remote repository: git push origin --delete branch-name For all commands, refer to the official Git documentation for additional options and safety considerations.