Git Workflows

**Judgment** High-quality, comprehensive advanced Git workflow reference. Well-suited for agents handling real-world development tasks beyond basic add/commit/push, especially in complex repos and monorepos. **Strengths** - Covers nearly all major advanced workflows: interactive rebase, autosquash, bisect (manual + scripted), worktrees, reflog recovery, subtree vs submodule, sparse checkout, conflict resolution, rerere, stash patterns, blame/log archaeology, tags/releases. - Commands are concrete, well-commented, and organized by intent, which is ideal for automated use. - Provides useful heuristics and best practices (e.g., prefer subtree unless you need submodules, enable rerere globally, use reflog as safety net, avoid rebasing shared commits). - Includes explicit recovery patterns for dangerous operations (reflog-based recovery, reset back to HEAD@{n}, fsck for stashes). **Key Risks / Limitations** - Contains inherently destructive commands (e.g., `git reset --hard`, `git rebase` on local history, `git stash clear`, submodule removal procedures). Misuse by an agent without proper context or confirmation can cause data loss. - Although there are warnings about not rebasing shared branches, enforcement is left to the caller; the skill itself does not add guardrails or pre-checks. - Assumes a relatively standard Git setup; does not cover specialized environments (e.g., Git LFS edge cases, unusual hooks, or enterprise workflows) but is still broadly applicable. **Recommended Scenarios** - Cleaning up and structuring feature branches before merging (squash/reword/reorder/split commits via interactive rebase and autosquash). - Debugging regressions in a codebase by pinpointing the first bad commit with `git bisect` (manual or automated with scripts). - Managing parallel work or PR reviews efficiently using `git worktree` instead of multiple clones. - Recovering from mistakes such as bad rebases, hard resets, or accidentally deleted branches using `git reflog` and related recovery commands. - Managing shared libraries and large codebases with subtree/submodule strategies and sparse checkout for monorepos. **Use with Caution** - For any operation that rewrites history or discards data (`rebase`, `reset --hard`, `cherry-pick` conflicts, `stash clear`, subtree splitting), the calling agent should: - Confirm whether the target branch is shared or already pushed. - Consider creating a safety branch or tag before the operation. - Prefer recovery-first sequences when the user reports “lost” work. Overall, this skill is a strong, production-ready foundation for advanced Git operations, provided the integrating agent adds context checks and confirmation steps around destructive actions.