Git rebase
Skill kimtth/agent-skill-100-lines-or-less/skills/git-rebase
🧿 Minimal but effective AI agent skill definitions in 100 lines or less.
npx -y skills add kimtth/agent-skill-100-lines-or-less --skill git-rebaseAssembled from the repository path, not quoted from the project. Check it against their README if it does not work.
2 things to look at
- no licenseNo license file was found in the repository. Code published without one is not open source by default, so using it at work is a question for whoever answers licensing questions where you are.
- 2 stars2 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.
What its author says it does
Copied from the file, not written here
Use when: clean up or reorder commits with rebase while keeping history safe and reviewable.
SKILL.md
1.0 KB, 210 tokens by cl100k_base, as published. Nobody here has run it
Goal: a clear, linear history without losing work or rewriting shared commits.
Use for:
- tidying a branch before opening a pull request
- squashing, reordering, or editing local commits
- updating a feature branch onto the latest base
Workflow:
- Confirm the commits are not yet shared, or coordinate first.
- Rebase interactively to squash, reword, or reorder.
- Update onto the base branch to incorporate new changes.
- Resolve conflicts commit by commit.
- Run tests after rebasing, before pushing.
- Force-with-lease to push a rewritten branch safely.
Operations:
- squash fixups into the commit they belong to
- reword messages for clarity
- reorder to tell a logical story
- drop dead or accidental commits
Rules:
- never rebase commits others have already based work on
- use --force-with-lease, never plain --force
- keep each commit building and passing where feasible
- back up the branch before a risky rebase