swell-agents/coding-skills / skills/committing-changes
committing-changes
VerifiedCommit via feature branch + PR + git hooks; never push main, never merge.
| File | Kind | Size |
|---|---|---|
| SKILL.md | skill md | 4.5 KB |
| reference/commit-md-original.md | markdown | 1.5 KB |
| reference/git-rule.md | markdown | 670 B |
| reference/hook-troubleshooting.md | markdown | 2.3 KB |
| scripts/commit-msgexecutable | script | 1006 B |
| scripts/install-hooks.shexecutable | script | 747 B |
| scripts/install-pr-size-workflow.shexecutable | script | 1.4 KB |
| scripts/pre-commitexecutable | script | 1.2 KB |
| scripts/pre-pushexecutable | script | 504 B |
| templates/gitattributes.example | other | 672 B |
| templates/pr-size.yml | config | 1.4 KB |
SKILL.md
View on GitHub---
name: committing-changes
description: Commit via feature branch + PR + git hooks; never push main, never merge.
allowed-tools: Read, Edit, Write, Bash(git status *), Bash(git diff *), Bash(git log *), Bash(git add *), Bash(git commit *), Bash(git push *), Bash(git checkout *), Bash(git branch *), Bash(git merge *), Bash(git fetch *), Bash(git rev-parse *), Bash(gh pr *), Bash(gh repo *), Bash(bash scripts/install-hooks.sh), Bash(bash scripts/install-pr-size-workflow.sh)
---
## Workflow
1. **Install hooks** (once per repo).
From inside the repo, run the installer that ships with this skill:
```
bash <skills>/committing-changes/scripts/install-hooks.sh
```
This copies `commit-msg` and `pre-push` into `.git/hooks/` and makes them executable. Idempotent.
Then install the PR-size CI workflow:
```
bash <skills>/committing-changes/scripts/install-pr-size-workflow.sh
```
This drops `.github/workflows/pr-size.yml` and appends `.gitattributes` exclusions. Idempotent.
2. **Branch check.** If on `main`, switch to a feature branch:
```
git checkout -b <type>/<description>
```
Valid `type` prefixes: `feat`, `fix`, `refactor`, `docs`, `test`, `chore`, `infra`, `ai-native`.
3. **Auto-fix before commit.** Run the project's linter/formatter (e.g., `ruff format && ruff check` for Python, `golangci-lint run` for Go, `forge fmt && solhint` for Solidity). The pre-commit hook (if installed) runs the project's full quality gate.
4. **Commit & push.**
```
git add <specific paths>
git commit -m "<subject conforming to rules below>"
git push -u origin <branch>
```
5. **Sync with main.**
```
git fetch origin main
git merge origin/main
```
Resolve conflicts; commit the merge; push.
6. **PR creation** (first push only).
```
gh pr list --head <branch>
gh pr create --fill # if no PR exists yet
```
7. **Branch cleanup** (after the user has merged).
```
git fetch --prune
git branch --merged main | grep -v '^\*\|main' | xargs -r git branch -d
```
## Rules
- **Never push directly to `main`.** Always feature branches + PRs. The `pre-push` hook blocks this.
- **Never merge branches or PRs.** Always let the user merge.
- **Never force-push.** No `--force`, no `--force-with-lease`. Create new commits instead.
- **One logical change per commit.**
- **PR size**: ≤1000 changed lines per PR (excluding tests, docs, lockfiles, generated). Enforced by `.github/workflows/pr-size.yml`.
- **Commit-message subject** (enforced by `commit-msg` hook):
- Capital start (imperative mood: "Add", "Fix", "Refactor", not "added"/"adds").
- ≤ 72 chars.
- No trailing period.
- No `Co-Authored-By:` lines.
## Why this discipline
Each rule traces to a specific failure mode:
- *No direct push to main* → no broken `main`, every change is reviewable.
- *No agent-side merge* → the human keeps the merge decision; agents never close the loop unilaterally.
- *No force-push* → preserves history; reviewers can trust commit hashes.
- *One logical change per commit* → bisect works; reverts are surgical.
- *Subject rules* → consistent log readability; no noisy attribution lines.
## Cross-references
- `shell-discipline` — issue these `git`/`gh` commands one per call, no `&&` chains.
- `engineering-philosophy` — "Small Steps" and "Investigate, Don't Mask" map directly to one-logical-change-per-commit and don't-disable-failing-hooks.
## Reference
- [scripts/commit-msg](scripts/commit-msg) — subject-line rules enforcer.
- [scripts/pre-commit](scripts/pre-commit) — runs project's lint/format/test before commit.
- [scripts/pre-push](scripts/pre-push) — blocks direct push to `main`/`master`.
- [scripts/install-hooks.sh](scripts/install-hooks.sh) — idempotent installer.
- [templates/pr-size.yml](templates/pr-size.yml) — GitHub Actions workflow that labels PR size and fails when >1000 changed lines (excluding tests, docs, lockfiles, generated).
- [templates/gitattributes.example](templates/gitattributes.example) — `linguist-generated`/`linguist-vendored` entries appended to `.gitattributes` so GitHub collapses generated files in PR diffs.
- [scripts/install-pr-size-workflow.sh](scripts/install-pr-size-workflow.sh) — idempotent installer for the workflow + `.gitattributes` block.
- [reference/commit-md-original.md](reference/commit-md-original.md) — original Claude-Code `commit.md` command verbatim.
- [reference/git-rule.md](reference/git-rule.md) — original `rules/git.md` verbatim.
- [reference/hook-troubleshooting.md](reference/hook-troubleshooting.md) — common failure modes + fixes.
Related skills
| Skill | Stars | Updated | Works with | Status | Install |
|---|---|---|---|---|---|
| receiving-code-reviewobra/superpowersUse when receiving code review feedback, before implementing suggestions, especially if feedback seems unclear or technically questionable - requires technical rigor and verification, not performative agreement or blind implementation | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |
| requesting-code-reviewobra/superpowersUse when completing tasks, implementing major features, or before merging to verify work meets requirements | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |
| using-git-worktreesobra/superpowersUse when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace exists via native tools or git worktree fallback | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |
| verification-before-completionobra/superpowersUse when about to claim work is complete, fixed, or passing, before committing or creating PRs - requires running verification commands and confirming output before making any success claims; evidence before assertions always | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |