05. Git Disaster Recovery: git reflog, Cherry-Pick & Recovering Deleted Commits/Branches • Git, System Design & Web Security (OWASP Top 10) • Rishabh Ki Kaksha

Git, System Design & Web Security (OWASP Top 10) › 05. Git Disaster Recovery: git reflog, Cherry-Pick & Recovering Deleted Commits/Branches

45 mins

← Prev Next →

Course Syllabus

Module 1: Git Internals, Plumbing Commands & DAG Graph Architecture

01. Git Internals: Blobs, Trees, Commits & Annotated Tags (The .git Directory Anatomy) 02. Git DAG (Directed Acyclic Graph) & Plumbing Commands (cat-file, hash-object, write-tree) 03. Git Three Trees Architecture: Working Directory, Staging Index & HEAD

Part 1: Git Mastery, Security Defense & Caching

Module 2: Advanced Branching Strategies & Disaster Recovery

04. Advanced Rebasing: Interactive Rebase (squash, edit, fixup) vs Merge 05. Git Disaster Recovery: git reflog, Cherry-Pick & Recovering Deleted Commits/Branches 06. Enterprise Branching: Trunk-Based Development vs GitFlow vs Feature Flag Architecture

Module 3: Web Application Security: OWASP Top 10 Defenses

07. OWASP #1 & #3: SQL Injection (SQLi) & Server-Side Request Forgery (SSRF) Hardening 08. Cross-Site Scripting (XSS): Stored, Reflected, DOM-based & Content Security Policy (CSP) 09. CSRF vs Cross-Origin Traps: SameSite Cookies, Anti-CSRF Tokens & CORS Preflight Rules 10. Broken Object-Level Authorization (BOLA/IDOR) & Role-Based Access Control (RBAC/ABAC)

Module 4: Cryptography, PKI, SSL/TLS & Mutual Auth (mTLS)

11. Asymmetric Cryptography (RSA vs ECC) & Digital Signatures with GPG Keys 12. Public Key Infrastructure (PKI), TLS 1.3 Handshake & Let's Encrypt Automation 13. Mutual TLS (mTLS) for Zero-Trust Service-to-Service Communication

Module 5: DevSecOps, Secret Scanning & Zero-Trust Security Architecture

14. Automated Secret Scanning (Gitleaks, Trufflehog) & Git Pre-Commit Hooks 15. Software Supply Chain Security: Dependabot, SBOM (Software Bill of Materials) & Signed Commits 16. Enterprise Zero-Trust Architecture: Cloud IAM, Bastion Hosts & WireGuard VPN Networks

Interactive Lesson Studio

# 05. Git Disaster Recovery: git reflog, Cherry-Pick & Recovering Deleted Commits/Branches

> Git & Web Security Notes by Rishabh - Topic 05

---

### 1. `git reflog`: The Safety Net of Git 🛡️

Git me commit kabhi instantly delete nahi hota!  
**`git reflog` (Reference Log)** aapke local machine par `HEAD` pointer ke **har single movement (checkout, commit, reset, rebase, merge) ka chronological history record** rakhta hai!

---

### 2. Recovering Accidentally Deleted Branch / Hard Reset 🚑

Scenario: Developer ne galti se `git reset --hard HEAD~5` chala diya ya branch delete kar di (`git branch -D feature-auth`):

```bash
# Step 1: Inspect reflog to find the lost commit hash:
git reflog

# Output:
# 3a1b2c4 HEAD@{0}: reset: moving to HEAD~5
# 7f8e9d0 HEAD@{1}: commit: Add complete Stripe payment gateway   <=== THE LOST WORK!

# Step 2: Restore lost commit onto a fresh branch:
git branch recovered-feature 7f8e9d0

# ✅ Boom! 100% code fully recovered in 2 seconds!
```

---

### 3. `git cherry-pick`: Porting Specific Commits 🍒

Doosri branch me se sirf 1 specific critical bug fix commit ko current branch me apply karna:

```bash
# Apply commit 7f8e9d0 onto current branch:
git cherry-pick 7f8e9d0
```

---

### 4. Dangling Objects & `git fsck` (Lost Commits Recovery)

```bash
# Find all unreachable dangling commits in .git/objects:
git fsck --lost-found
```

---

### 5. Master Comparison Matrix

---

### 6. Interview Ke 3 Sawal Is Topic Se

1. **`git reflog` remote GitHub repository par kyu available nahi hota?** -> Kyunki reflog purely local developer workstation execution history track karta hai; Git push karne par reflog metadata transfer nahi hota.
2. **Git Garbage Collection (`git gc`) kya karta hai?** -> Loose object files ko packfile binaries me compress karta hai aur 90 din purane unreachable dangling objects ko permanently purge karta hai.
3. **Cherry-pick conflicts kaise resolve hote hain?** -> Conflict fix karo ➔ `git add` ➔ `git cherry-pick --continue`.

---
**Next Topic:** 06. Enterprise Branching: Trunk-Based Development vs GitFlow vs Feature Flag Architecture

Loading lesson content...

Python 3.12

Full IDE

Live Execution Terminal

Click "Execute Live" to run code.
                

Lesson Mastery AI Quiz

AI Doubt Solver

CERTIFICATE OF COMPLETION

Rishabh Gehlot

PHP 8+ & Laravel 11 Master Track