clean-commit-history
Clean up the current branch's commit history by incorporating uncommitted changes into the correct recent commits.
Procedure
1. Assess current state
- Run
git statusto check for uncommitted changes (staged + unstaged + untracked). - If there are NO uncommitted changes, stop and inform the user.
- Run
git log --oneline <base-branch>..HEADto see the branch's commits (detect base branch from tracking info or the repository's default branch, e.g.mainormaster). - If there is only one commit on the branch, there is nothing to fixup into — just amend that commit with the pending changes and force-push.
2. Analyze and assign
More from soyio-id/skills
commit-work
Review, organize, and commit pending changes. Split into logical commits, stage carefully, and write clear Conventional Commit messages. Use when the user asks to commit, stage changes, or organize work into commits.
10create-pr
Create a clear, review-ready pull request with gh CLI. Gather context from commits and diff, follow repository templates, push safely, and return the PR URL with merge guidance.
10using-git-worktrees
Use when starting feature work that needs isolation from current workspace or before executing implementation plans - creates isolated git worktrees with smart directory selection and safety verification
9create-worktree
Create an isolated worktree for a new branch, existing branch, or PR review. Prefer repo-local worktree commands when they exist, and fall back to vanilla git worktrees otherwise.
8prepare-security-prs
Triage and prepare automated dependency security PRs for merge with minimal risk. Identify bot PRs that need intervention, resolve required issues only, refresh stale branches safely, detect superseded PRs, and keep diffs dependency-focused.
8fix-vulnerabilities
Fix multiple dependency vulnerabilities across multiple repos. Parses Vanta-style vulnerability entries, groups by repo, creates a single fix branch per repo, applies all fixes, verifies compatibility, and creates PRs after user approval. Use when the user says '/fix-vulnerabilities' or asks to fix vulnerabilities across repos.
7