Recovering from hard reset in Git - Practice Problems & Coding Challenges

Challenge - 5 Problems

💻 Command Output

intermediate

What is the output of git reflog after a hard reset?

You ran git reset --hard HEAD~2 and want to see the previous commit references to recover lost work. What does git reflog show?

Git

git reflog

A A list of all branches but no commit hashes

B An empty list because hard reset deletes history

C Only the current commit hash with no previous entries

D A list of recent HEAD positions including the commit before the hard reset

💡 Hint

Think about how Git tracks HEAD movements even after resets.

git reflog records all movements of HEAD, including resets. This lets you find commits lost after a hard reset.

🔀 Workflow

intermediate

Which command sequence recovers a commit lost after a hard reset?

You accidentally ran git reset --hard HEAD~1 and want to restore the lost commit. Which sequence correctly recovers it?

A git branch; git merge origin/main

B git reflog; git checkout <commit-hash-from-reflog>

C git log; git revert HEAD~1

D git status; git reset --soft HEAD~1

💡 Hint

Use the command that shows recent HEAD changes and then checkout the lost commit.

git reflog shows lost commits. Checking out the commit hash from reflog recovers it.

❓ Troubleshoot

advanced

Why does git reset --hard sometimes seem to lose commits permanently?

After running git reset --hard, you cannot find your previous commits in git log. What is the reason?

A The commits are still in reflog but not in the current branch history

B The commits are deleted from the repository permanently

C The commits are moved to a new branch automatically

D The commits are archived in a hidden folder

💡 Hint

Think about how Git stores commit references separately from branch pointers.

Hard reset moves the branch pointer but reflog keeps track of previous HEAD positions, so commits are not deleted immediately.

🧠 Conceptual

advanced

What is the role of git reflog in recovering from a hard reset?

Explain why git reflog is essential for recovering commits after a hard reset.

A It merges branches after a reset

B It creates backups of your repository automatically

C It records all changes to HEAD, allowing you to find lost commits

D It permanently deletes commits after reset

💡 Hint

Consider what information reflog stores about HEAD.

git reflog tracks every change to HEAD, so even if commits are no longer on a branch, you can find their hashes here.

✅ Best Practice

expert

What is the safest way to avoid losing work when using git reset --hard?

Before running git reset --hard, which practice best protects your work from accidental loss?

A Create a temporary branch pointing to the current commit

B Run <code>git clean -fd</code> to remove untracked files

C Use <code>git stash</code> and then delete the stash immediately

D Delete the .git folder to reset the repository

💡 Hint

Think about how to save your current state safely before resetting.

Creating a temporary branch saves your current commit reference, so you can return to it if needed after a hard reset.

Practice

1. What is the primary command to view the history of recent commits and actions in Git after a hard reset?

easy

A. git status

B. git log --oneline

C. git reflog

D. git reset --soft

Solution

1. Step 1: Understand the purpose of git reflog

   git reflog shows a log of all recent commits and HEAD movements, including resets.

2. Step 2: Compare with other commands

   git log --oneline shows commit history but not HEAD changes; git status shows current state; git reset --soft changes HEAD but does not show history.

3. Final Answer:

   git reflog -> Option C

4. Quick Check:

   View recent HEAD changes = git reflog [OK]

Hint: Use git reflog to see all recent HEAD changes [OK]

Common Mistakes:

• Confusing git log with git reflog
• Using git status to find past commits
• Thinking git reset shows history

2. Which of the following is the correct syntax to reset your Git repository to a previous commit with a hard reset?

easy

A. git reset --hard <commit>

B. git reset -soft <commit>

C. git checkout --hard <commit>

D. git revert --hard <commit>

Solution

1. Step 1: Identify the correct reset syntax

   The correct command to reset to a previous commit and discard changes is git reset --hard <commit>.

2. Step 2: Eliminate incorrect options

   -soft is invalid flag, git checkout --hard is not a valid command, and git revert does not accept --hard.

3. Final Answer:

   git reset --hard <commit> -> Option A

4. Quick Check:

   Hard reset syntax = git reset --hard [OK]

Hint: Use git reset --hard commit_hash to restore state [OK]

Common Mistakes:

• Using -soft instead of --hard
• Confusing git revert with reset
• Trying git checkout with --hard

3. After running git reset --hard HEAD~2, which command will help you find the commit hash to recover your lost changes?

medium

A. git status

B. git branch

C. git diff

D. git reflog

Solution

1. Step 1: Understand what git reset --hard HEAD~2 does

   This command moves HEAD back two commits and discards changes, potentially losing recent commits from view.

2. Step 2: Identify command to find lost commit hashes

   git reflog shows all recent HEAD positions including those before the reset, allowing recovery.

3. Final Answer:

   git reflog -> Option D

4. Quick Check:

   Find lost commits after reset = git reflog [OK]

Hint: Use git reflog to find lost commit hashes after reset [OK]

Common Mistakes:

• Using git status which shows current state only
• Using git branch which lists branches, not commits
• Using git diff which shows changes, not history

4. You accidentally ran git reset --hard HEAD~1 and lost your latest commit. Which sequence of commands will help you recover it?

medium

A. git reflog to find commit hash, then git reset --hard <hash>

B. git log to find commit, then git revert HEAD

C. git checkout HEAD~1 then git commit --amend

D. git reset --soft HEAD~1 then git commit

Solution

1. Step 1: Use git reflog to find lost commit hash

   git reflog lists all recent HEAD positions including the lost commit before reset.

2. Step 2: Reset hard to the lost commit hash

   Use git reset --hard <hash> to restore the repository to that commit state.

3. Final Answer:

   git reflog then git reset --hard <hash> -> Option A

4. Quick Check:

   Recover lost commit = reflog + reset --hard [OK]

Hint: Find commit with reflog, restore with reset --hard [OK]

Common Mistakes:

• Using git log which may not show lost commits
• Trying git revert which creates new commits
• Using reset --soft after hard reset without commit hash

5. You performed a hard reset to a commit two steps behind but realize you need to recover the lost commits and keep your current changes. What is the best approach?

hard

A. Run git reset --hard HEAD@{1} to go back to previous HEAD state

B. Use git reflog to find lost commits, then git cherry-pick them onto current branch

C. Use git revert on the reset commit to undo the reset

D. Create a new branch from HEAD~2 and merge it back

Solution

1. Step 1: Find lost commits using git reflog

   git reflog shows the commit hashes that were lost after the hard reset.

2. Step 2: Use git cherry-pick to apply lost commits onto current branch

   This preserves current changes and reapplies lost commits without resetting the branch.

3. Final Answer:

   Use git reflog and cherry-pick lost commits -> Option B

4. Quick Check:

   Recover lost commits without losing current changes = reflog + cherry-pick [OK]

Hint: Cherry-pick lost commits found via reflog to keep current work [OK]

Common Mistakes:

• Using reset --hard to go back loses current changes
• Using revert on reset commit does not restore lost commits
• Merging from old branch may cause conflicts or duplicate commits