gitlisted

# Git — Advanced Git Workflows ## Activate When - User invokes `/godmode:git` - User says "branching strategy", "rebase vs merge" - User says "git bisect", "interactive rebase" - User needs parallel development with worktrees - Messy history detected during review or ship ## Workflow ### Step 1: Assess Repository Context ```bash # Repository stats git log --oneline | wc -l # Total commits git branch -a | wc -l # Total branches git shortlog -sn | wc -l # Contributors git branch --merged main | wc -l # Stale branches # Detect commit conventions git log --oneline -20 | head -10 # Check for tooling ls .commitlintrc* .husky/ .git/hooks/commit-msg \ 2>/dev/null ``` ``` GIT CONTEXT: Team: solo | small (2-5) | medium (6-15) | large (15+) Release cadence: continuous | weekly | monthly Default branch: <main | master> Commit convention: <conventional | custom | none> Stale branches: <N branches merged but not deleted> Stash count: <N> IF team == solo: GitHub Flow or trunk-based IF team == small: GitHub Flow or Ship/Show/Ask IF team == large: trunk-based with feature flags IF stale branches > 10: clean up immediately IF stash count > 3: convert to branches or drop ``` ### Step 2: Branching Strategy ``` STRATEGY SELECTION: | Team Size | Cadence | Recommended | |-----------|------------|-------------------| | Solo | Continuous | Trunk-based | | 2-5 | Weekly | GitHub Flow | | 6-15 | Bi-weekly | Trunk-based