Version Control with Git: Beyond the Basics

# Workflow
1. Create branch from main
2. Make changes
3. Open pull request
4. Review and merge
5. Deploy

# Squash last 3 commits
git rebase -i HEAD~3

# Rebase onto main
git checkout feature
git rebase main

# Apply specific commit
git cherry-pick abc123

# Cherry-pick without commit
git cherry-pick -n abc123

# Save work in progress
git stash push -m "work in progress"

# List stashes
git stash list

# Apply stash
git stash pop

# Create branch from stash
git stash branch feature-branch

# Unstage files
git reset HEAD file.txt

# Soft reset (keep changes staged)
git reset --soft HEAD~1

# Mixed reset (unstage, keep files)
git reset HEAD~1

# Hard reset (destroy changes)
git reset --hard HEAD~1

# Create new commit undoing changes
git revert abc123

# Revert merge commit
git revert -m 1 abc123

# View all reference updates
git reflog

# Recover lost commit
git checkout HEAD@{2}

git submodule add https://github.com/org/repo.git libs/repo

# Clone with submodules
git clone --recurse-submodules repo.git

# Update all submodules
git submodule update --recursive

# Pull in submodules
git pull --recurse-submodules

# Start bisect
git bisect start

# Mark current commit (bad)
git bisect bad

# Mark known good commit
git bisect good v1.0.0

# Test, then mark
git bisect good  # or bad
git bisect reset  # when done

# Create worktree for feature
git worktree add ../feature-branch main

# List worktrees
git worktree list

# Remove sensitive data
bfg --delete-files passwords.txt
git reflog expire --expire=now --all
git gc --prune=now --aggressive

# Conventional commits
feat: add user authentication
fix: resolve login redirect issue
docs: update API documentation
refactor: simplify payment logic
test: add user model tests

# Full format
feat: add payment processing

- Add Stripe integration
- Handle webhooks
- Update user balance

Closes #123

# .git/hooks/pre-commit
#!/bin/sh
npm test
npm run lint

# .git/hooks/commit-msg
#!/bin/sh
COMMIT_MSG=$(cat "$1")
if ! echo "$COMMIT_MSG" | grep -E "^(feat|fix|docs|test|chore)"; then
    echo "Commit message must start with feat, fix, docs, test, or chore"
    exit 1
fi

# ~/.gitconfig
[alias]
    co = checkout
    br = branch
    st = status
    lg = log --oneline --graph --decorate
    undo = reset --soft HEAD~1
    amend = commit --amend --no-edit
    graph = log --oneline --all --graph

# .github/CODEOWNERS
* @senior-engineer
/src/auth/ @auth-team
/tests/ @qa-team

# Detached HEAD
git checkout -b fix-branch
git branch -f main HEAD
git checkout main

# Abort merge
git merge --abort

# Large file
git lfs install
git lfs track "*.psd"