Codex skills for Git
These skills give Codex git recipes that never open an interactive editor, which would hang its shell: scripted rebase todos, partial staging through git apply --cached and bisect scripts kept outside the repo. Every history rewrite starts from a backup branch and ends with a range-diff, and force pushes wait for your explicit go-ahead.
Start with these 3
- Git Commit Hygiene Atomic commits a reviewer can read in order Codex plans a commit series before staging, keeps refactors and behaviour changes apart, and stages partial files through git apply --cached because interactive add hangs an agent shell. Messages follow the 50/72 convention with real reasons and trailers, and git rebase --exec proves every commit in the series builds and passes tests.
- Git History Surgery Rewrite history with a backup and a proof Codex rewrites history with recipes that need no interactive editor: autosquash for fixups, GIT_SEQUENCE_EDITOR and GIT_EDITOR scripting for reword and edit, cherry-pick rebuilds for reordering, and reset --keep for misplaced commits. Each rewrite starts with a backup branch and ends with an empty tree diff plus range-diff, and force pushes wait for your explicit go-ahead.
- Git Bisect Name the commit that broke it, in log2(n) runs Codex writes a bisect check script that lives outside the repo, imports the checked-out code, tests only the symptom and maps unbuildable commits to skip. It proves the script on both ends before starting, repeats runs for flaky failures, uses --first-parent and custom terms when the history or the question calls for them, and confirms the culprit by hand before reporting it.
12 more Git skills
-
Git Worktrees
Two branches checked out at once, no stashing -
Codex Parallel Worktrees
One checkout per agent, zero collisions -
Merge Conflict Resolution
Keep both intents, not just one side's text -
Codebase Onboarding
Answer how this repo works with file paths, not guesses -
Changelog Writing
Entries users can act on, not commit subjects -
Pre-commit Hooks
Hooks that fix staged files in seconds, not minutes -
Stacked Pull Requests
Small dependent PRs that merge bottom-up cleanly -
Code Archaeology
Find the commit, PR and reason behind any line -
Agentic PR Workflow
Agent PRs with evidence, not just claims -
Conventional Commits
Commit types your release tooling can trust -
Trunk-Based Development
Merge daily, keep main releasable, revert first -
Release Management
Tag the tested commit and write rollback first
General skills with Git guidance
Not built around Git, but they include steps or tools for it. Not part of the install-all command.
-
DigitalOcean Apps
App specs in git, databases behind trusted sources -
Algolia Search
Relevance settings in git, zero-downtime reindexes -
Codex Task Decomposition
Big changes as small, green, reviewable steps -
Technical Debt Triage
Rank debt by the interest it charges every month -
CODEOWNERS Setup
Route every PR to the team that owns the code -
Monorepo Tooling
Cache hits you can trust, CI that builds only what changed -
Go Modules
Clean go.mod, honest versions, no laptop paths -
Jupyter Notebooks
Notebooks that rerun from a clean kernel -
ML Experiment Tracking
Every number traceable to one reproducible run -
Argo CD GitOps
Promote by commit, roll back by revert -
Terraform Modules
Small typed interfaces, refactors with zero destroys -
Secrets Management
No plaintext keys, rotation you have rehearsed
Every Git skill in one command
Installs these 15 into ~/.agents/skills/. Add --project after -- to install into the current repository instead.
The installer is a 104-line POSIX shell script. It fetches the skills you name from codexskills.dev and unpacks each into its own folder in your skills directory. No sudo, no telemetry, and every skill page shows the full SKILL.md first. Read install.sh
curl -fsSL codexskills.dev/install.sh | sh -s -- git-commit-hygiene git-history-surgery git-bisect git-worktrees codex-parallel-worktrees merge-conflict-resolution codebase-onboarding changelog-writing pre-commit-hooks stacked-pull-requests code-archaeology agentic-pr-workflow conventional-commits trunk-based-development release-management Git FAQ
Can Codex find which commit broke a test with git bisect?
Git Bisect writes a check script kept outside the repo that exits 0 for good, 1 for bad and 125 to skip unbuildable commits, then hands it to git bisect run. It proves the script on both ends first, repeats runs for flaky symptoms, uses --first-parent for merge-heavy histories, and confirms the culprit by hand before reporting it.
Can Codex squash or reword commits without git rebase -i?
Git History Surgery scripts rebase todos through GIT_SEQUENCE_EDITOR and GIT_EDITOR, uses fixup commits with autosquash, and squashes a branch with reset --soft. Each rewrite starts with a timestamped backup branch and ends with an empty diff against it plus a range-diff, and lost work is recovered from the reflog. Force pushes wait for your explicit go-ahead.
How does Codex resolve lockfile merge conflicts?
Merge Conflict Resolution regenerates lockfiles for npm, pnpm, Yarn, uv, Poetry, Go and Cargo, along with generated files and snapshots, instead of splicing conflict markers. It reads base, ours and theirs with zdiff3, keeps the ours/theirs inversion during a rebase straight and reuses resolutions with rerere. Every merge is built and tested, because a clean merge can still break behaviour.
How do I install all 15 Git skills at once?
Pass every name to the installer in one command: curl -fsSL https://codexskills.dev/install.sh | sh -s -- git-commit-hygiene git-history-surgery git-bisect git-worktrees codex-parallel-worktrees merge-conflict-resolution codebase-onboarding changelog-writing pre-commit-hooks stacked-pull-requests code-archaeology agentic-pr-workflow conventional-commits trunk-based-development release-management. Add --project right after -- to put them in the current repository's .agents/skills/ so your team gets them too.
Which Git skill should I try first?
Git Commit Hygiene is the closest fit for most Git work. Mention it with $git-commit-hygiene in a prompt to load it on purpose; after that, Codex picks it up on its own whenever a task matches.