Git Advanced: Monorepo, Submodules & Workflows · Lesson

Recovering Lost Commits and Branches

Master advanced recovery techniques using `git reflog` and other tools to restore lost work and branches.

Recovering Lost Commits and Branches is a free Git Advanced: Monorepo, Submodules & Workflows lesson on CoddyKit — lesson 1 of 4. You can read the complete lesson below for free — then practise it hands-on in the browser with a built-in code editor and a 24/7 AI tutor. It is part of the Git Advanced: Monorepo, Submodules & Workflows learning path, one of 4 lessons in the course, and your progress syncs across the web and the CoddyKit app.

What Does 'Lost' Mean in Git?

In Git, losing work often means it's just out of immediate reach, not permanently deleted. Git's internal mechanisms keep a detailed history, making recovery possible.

This lesson will equip you with advanced techniques to recover commits, branches, and even fix tricky situations like a detached HEAD.

Reflog: Your Ultimate Safety Net

You might already know git reflog is a powerful tool. It records nearly every change to your HEAD, effectively creating a local history of your repository's state.

Think of it as a journal of where your HEAD pointer has been, even across resets, merges, and checkouts. It's your first stop for recovery.

Decoding Reflog Entries

Each entry in your reflog has a specific format. Understanding it is key to finding what you need:

HEAD@{n}: Indicates the state of HEAD 'n' steps ago.
The commit hash: The actual SHA-1 identifier of the commit.
The action: A description of what happened (e.g., commit, reset, checkout).

By scanning these entries, you can pinpoint the exact commit you wish to recover.

Scenario 1: Recovering a Lost Commit

A common scenario: you accidentally use git reset --hard and lose your latest work. Don't panic! Your commit is still in the reflog.

You can find the commit hash of your 'lost' commit in the reflog and then use git reset --hard to move your current branch's HEAD back to that specific commit.

Example: Resetting to a Reflog Entry

Let's simulate losing a commit and then recovering it. We'll create a commit, 'lose' it with a hard reset, and then use reflog to get it back.

Run these commands in your terminal:

git init

echo "Initial content" > file.txt
git add .
git commit -m "Initial commit"

echo "Second change" >> file.txt
git add .
git commit -m "Second commit (to be lost)"

git reflog # Note the commit hash for "Second commit"

git reset --hard HEAD~1 # This 'loses' the second commit

git reflog # See the reset action

# To recover the 'Second commit', find its hash from the reflog output above.
# For example, if the hash was 'abcdefg':
# git reset --hard abcdefg

Scenario 2: Resurrecting a Deleted Branch

Accidentally deleted a branch with git branch -D my-feature? Git doesn't immediately destroy the commits; it just removes the pointer.

Use git reflog to find the last commit that your deleted branch pointed to. Once you have the commit hash, you can simply recreate the branch from that point.

git checkout -b feature-a
echo "Work for feature A" > feature.txt
git add .
git commit -m "Working on feature A"

git checkout main
git branch -D feature-a # Uh oh, deleted!

git reflog # Find the commit hash for 'feature-a'

# For example, if the hash was '1234567':
# git branch feature-a 1234567
# git checkout feature-a # Your branch is back!

Fixing a Detached HEAD State

A 'detached HEAD' occurs when your HEAD points directly to a commit, not a named branch. Commits made in this state won't be part of any branch unless you explicitly create one.

To fix it, simply create a new branch at your current HEAD position with git branch <new-branch-name>, then switch to it using git checkout <new-branch-name>.

git init
echo "Start" > a.txt
git add .
git commit -m "Initial commit"

git checkout HEAD~1 # This detaches HEAD

echo "New content" > b.txt
git add .
git commit -m "Lost commit in detached state"

# To recover this 'lost' commit:
# git branch my-recovered-work
# git checkout my-recovered-work

Beyond Reflog: `git fsck`

For even deeper recovery or integrity checks, git fsck (file system check) is your tool. It verifies the integrity of your Git repository and can find 'dangling' objects that aren't referenced by any ref (branch, tag, or reflog entry).

Using git fsck --lost-found can move these unreferenced objects (commits, blobs) into the .git/lost-found/ directory, giving you a chance to inspect and potentially recover them manually.

git fsck --full --unreachable
# Expected output might look like:
# dangling commit e1f2g3h4i5j6k7l8m9n0o1p2q3r4s5t6u7v8w9x0
# dangling blob a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6q7r8s9t0u1

Prevention is Key!

While Git offers robust recovery, preventing loss is always better:

Commit often: Small, frequent commits mean less to lose.
Push frequently: Remote repositories act as backups.
Descriptive messages: Helps identify commits in reflog.
Backup .git: For critical projects, consider backing up the .git directory itself.

Quick Check: Reflog Recovery

You've accidentally deleted your feature-x branch. Which commands are crucial for finding and restoring its last commit?

Recovery Mastered!

Congratulations! You've mastered advanced Git recovery techniques. You now have the skills to:

Identify and restore 'lost' commits using git reflog.
Resurrect accidentally deleted branches.
Navigate and fix a 'detached HEAD' state.
Utilize git fsck for deeper repository inspection and recovery.

Remember to always push your work to remote repositories regularly as your primary defense against data loss!

Frequently asked questions

Is the “Recovering Lost Commits and Branches” lesson free?

Yes — the full text of “Recovering Lost Commits and Branches” is free to read here on the web, and the Git Advanced: Monorepo, Submodules & Workflows course includes 4 lessons in total. To practise it interactively (a built-in code editor and a 24/7 AI tutor) and unlock the rest of the Git Advanced: Monorepo, Submodules & Workflows course, upgrade to CoddyKit PRO.

What will I learn in “Recovering Lost Commits and Branches”?

Master advanced recovery techniques using `git reflog` and other tools to restore lost work and branches. You practise Git Advanced: Monorepo, Submodules & Workflows with hands-on code you run directly in the browser, and a 24/7 AI tutor answers your questions as you work through the lesson.

Do I need any experience to start Git Advanced: Monorepo, Submodules & Workflows?

No prior experience is required. Git Advanced: Monorepo, Submodules & Workflows on CoddyKit is structured for beginners through advanced learners; this is — lesson 1 of 4, so you can start here or from the beginning and move at your own pace.

How long does the “Recovering Lost Commits and Branches” lesson take?

Most CoddyKit lessons take about 5–10 minutes. Each one is bite-sized and interactive, so you make steady progress and pick up exactly where you left off across the web and the app.

Can I write and run code in this Git Advanced: Monorepo, Submodules & Workflows lesson?

Yes. Every Git Advanced: Monorepo, Submodules & Workflows lesson includes a built-in code editor, so you write and run real code right in your browser and get instant AI feedback — no local setup required.

All lessons in this course

← Back to Git Advanced: Monorepo, Submodules & Workflows