Recuperación de commits y ramas perdidos

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.

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.

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.

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.

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:

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.

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>.

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.

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.

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

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!