GitFlow

Mon, 03 Feb 2025 16:37:00 +0000

Reference

GirFlow Explained: https://youtu.be/Aa8RpP0sf-Y

Git Undo Mistakes

Wed, 24 Mar 2021 23:12:00 +0000

Undoing Mistakes in Git

1. Discarding Uncommitted Changes

a) `git restore <file>`

Discards uncommitted modifications in the specified file.
Irreversible: once applied, changes cannot be recovered.

b) `git restore -p <file>`

The -p (patch) option lets you interactively choose hunks to discard.
Useful for selectively reverting parts of a file.

c) `git restore .`

Discards all uncommitted changes in the working directory since the last commit.

2. Amending the Last Commit

`git commit --amend -m "New Commit Message"`

Updates the message (and/or contents) of the last commit.
Do not amend commits that have already been shared with others.

3. Reverting a Specific Commit

`git revert <SHA>`

Creates a new commit that inverts the changes of the specified commit.
Safe way to “undo” a change without rewriting history.
Obtain the SHA from git log, e.g. 74e3b2b.

4. Resetting to an Earlier Commit

a) `git reset --hard <SHA>`

Moves HEAD and current branch to the given commit, discarding all subsequent commits and uncommitted changes.
Warning: unpushed commits are permanently lost.

b) `git reset --mixed <SHA>` (default)

Similar to --hard, but preserves changes from discarded commits as unstaged modifications.

5. Restoring a File from a Past Commit

`git restore --source <SHA> -- <file>`

Replaces the working copy of <file> with its state at the given commit.
Only affects the specified file.

6. Using the Reflog to Recover Lost Commits

`git reflog`

Records updates to HEAD (including resets) for a limited time.
Find the SHA of a lost state and then create a branch or reset to it.

Restoring After a Hard Reset

Locate the prior HEAD reference in the reflog.
Use git branch <new-branch> <reflog-SHA> to recover.

Recovering a Deleted Branch

Identify the branch tip SHA via git reflog.
Recreate the branch: git branch <branch-name> <SHA>.

7. Moving Commits to Another Branch

a) To a New Branch

git branch <new-branch>
git reset --hard HEAD~1

Creates <new-branch> at the current HEAD, then removes the last commit from the original branch.

b) To an Existing Branch

git checkout <target-branch>
git cherry-pick <SHA>

git checkout <original-branch>
git reset --hard HEAD~1

Cherry-picks the commit into <target-branch>, then removes it from the source branch.

8. Interactive Rebase for History Rewriting

Use with caution: Interactive rebase rewrites commit history, which can break shared branches.

Git on Rishav's Digital Garden

GitFlow

Reference

Git Undo Mistakes

Undoing Mistakes in Git

1. Discarding Uncommitted Changes

a) git restore <file>

b) git restore -p <file>

c) git restore .

2. Amending the Last Commit

git commit --amend -m "New Commit Message"

3. Reverting a Specific Commit

git revert <SHA>

4. Resetting to an Earlier Commit

a) git reset --hard <SHA>

b) git reset --mixed <SHA> (default)

5. Restoring a File from a Past Commit

git restore --source <SHA> -- <file>

6. Using the Reflog to Recover Lost Commits

git reflog

Restoring After a Hard Reset

Recovering a Deleted Branch

7. Moving Commits to Another Branch

a) To a New Branch

b) To an Existing Branch

8. Interactive Rebase for History Rewriting

a) `git restore <file>`

b) `git restore -p <file>`

c) `git restore .`

`git commit --amend -m "New Commit Message"`

`git revert <SHA>`

a) `git reset --hard <SHA>`

b) `git reset --mixed <SHA>` (default)

`git restore --source <SHA> -- <file>`

`git reflog`