# Organized Commits

> Use when the user asks to organize commits, split or group by intent, write conventional messages, clean up Git history, consolidate branches or worktrees, salvage stale work, or runs $organized-commits / /organized-commits (often then push). Also apply on freeform "git commit push" when they want intent-based commits rather than one dump commit. Commit on a feature-related branch, not main/default by default. Never delete remote branches unless explicitly asked. If they want full verify + handoff + no leftovers after push, also apply finish-and-ship.

- Skill: `yosefhayim/organized-commits` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds@latest add yosefhayim/organized-commits`
- Raw SKILL.md: https://api.skillmd.com/api/skills/yosefhayim/organized-commits/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: YosefHayim (https://skillmd.com/u/yosefhayim)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/yosefhayim/organized-commits

---


# Organized Commits

Make Git history a debug timeline: one intent per commit, useful messages, and no stranded work. Run only on an explicit commit, push, ship, or consolidation request.

## Safety

- Read repository instructions and inspect status, branch, upstream, recent history, staged/unstaged diffs, untracked files, worktrees, and stashes before staging.
- Preserve user-owned and unrelated changes. Stop if secrets, credentials, unexplained generated files, or ambiguous overlapping intent appear.
- **Feature branch by default:** if HEAD is the default branch and the work is product change (feature, fix, refactor, refinement, chore), **create/switch to a topic branch** before committing unless the user explicitly wants default-branch-only commits.
- Never change Git configuration, rewrite published history, force-push a protected branch, or delete branches, tags, stashes, or worktrees without explicit authorization.
- **Never `git push --delete` / delete remote refs** unless the user explicitly asks. Prefer leaving remotes for handoff and CI.
- Push only when requested. Existing approval remains valid when the user already asked for commit and push in the same task.
- Use merge, not rebase, to consolidate shared work. Create backup refs before integration.

## Workflow

1. Confirm branch: not accidental default-branch product commits. Branch name should reflect intent (`feat/…`, `fix/…`, `refactor/…`, …) when creating one.
2. Classify every changed path by intent: feature, fix, refactor, reorganization, removal, docs, test, build, CI, performance, style, or chore.
3. Group changes so each commit is independently understandable and does not leave the repository knowingly broken. Split mixed files by hunk only when the boundary is real.
4. Present the commit sequence when approval has not already been given. Include subject, intent, files, rationale, verification, and whether push is authorized.
5. Stage explicit paths or hunks. Audit `git diff --cached` before every commit.
6. Use an imperative conventional subject and a body that records motivation, concrete change, and impact:

   ```text
   type(scope): short subject

   Why: <motivation>
   What: <concrete change>
   Impact: <behavior, risk, or none>
   ```

7. Inspect status and the index after each commit because hooks may regenerate or stage files. Keep hook-produced changes with the intent that owns them.
8. Run the repository's fresh verification gate before shipping non-trivial work.
9. Immediately before push, fetch or inspect the remote relationship, confirm no secret entered the outgoing range, and push without force. Do not delete the remote branch afterward.

For classification, split, push, and consolidation examples, read [REFERENCE.md](REFERENCE.md). Multi-worktree fan-out or land → `sdlc-tasks-executions`. Full verify/handoff loop → `finish-and-ship`.

## Verification

Report:

- branch name (and that it is not default-by-accident for product work);
- every new commit SHA and subject;
- the fresh verification commands and outcomes;
- local branch, upstream, ahead/behind state, and pushed remote SHA;
- remaining staged, unstaged, untracked, stashed, branch, or worktree state;
- confirmation remote branches were not deleted unless explicitly requested.

Do not call history clean if work remains unexplained, and do not call a push complete until the remote contains the reported commit.