advanced

Git Advanced

Parent Skill: /git Path: /git/advanced

Purpose

Master advanced Git features including stash, cherry-pick, submodules, hooks, worktrees, sparse checkout, and Git attributes for power users.

When to Use

Trigger automatically when:

• User mentions: stash, cherry-pick, submodule, hook, worktree, sparse, filter-branch, LFS
• Need to save work without committing
• Apply specific commits across branches
• Manage dependencies as submodules
• Automate Git operations
• Work on multiple branches simultaneously

Chat commands:

/git/advanced save my work without committing
/git/advanced apply commit from another branch
/git/advanced set up git hooks
/git/advanced work on multiple branches at once
/git/advanced manage large files in git

Requirements

Verification

# Check Git version
git --version

# Check if Git LFS installed
git lfs --version

# Check hooks directory
ls -la .git/hooks/

# Check worktrees
git worktree list

---

Critical Rules

---

Patterns

Pattern 1: Stash (Save Work Without Committing)

Problem: Need to switch context but not ready to commit

# ❌ BAD: Commit unfinished work
git add .
git commit -m "WIP"  # Clutters history

# ✅ GOOD: Use stash
git stash
git stash push -m "Work in progress on login feature"

Basic stash workflow:

# Save current changes
git stash

# Or with message
git stash push -m "Login feature work"

# List stashes
git stash list
# stash@{0}: On main: Login feature work
# stash@{1}: On main: Dashboard updates

# Apply latest stash
git stash pop  # Apply and remove from stash list

# Apply without removing
git stash apply

# Apply specific stash
git stash apply stash@{1}

# Drop stash
git stash drop stash@{0}

# Clear all stashes
git stash clear