fixup
- Repo stars 330
- License MIT
- Author repo claude-skill-registry
- Domain
- Data
- Author-declared agents
- No explicit declaration found; this is not inferred or tested compatibility
- Static check
- 94 / 100 · heuristic scan, not runtime safety proof
- Runtime evidence
- Not run; no isolated runtime test evidence is currently recorded
- Author / version / license
- @majiayu000 · MIT
- Token usage
- Lean
- Setup complexity
- Plug-and-play
- External API key
- Not required
- Operating systems
- Unspecified (assume cross-platform)
- Runtime requirements
- No explicit requirements detected
- Detected file/system behavior
-
- Read-only
- Write / modify
- Network behavior
- External requests
- Install commands
- None (reference only)
Heads up: Tool permissions are not declared; actual access depends on the runtime.
# Fixup
You are assisting with fixing up an existing commit using interactive rebase. Follow these steps:
## 1. Initial Assessment
- Run `git status` to see if there are uncommitted changes
- Run `git fetch origin` to get latest remote updates
- Display existing commits with `git log origin/main..HEAD --oneline`
## 2. Create Fixup Commit
If there are uncommitted changes:
1. Show the commit history
2. Ask user which commit hash to fixup (or identify it based on context)
3. Stage changes with `git add .` or ask which files to stage
4. Create a fixup commit:
```bash
git commit --fixup=<commit-hash>
```
## 3. Autosquash Rebase
Run non-interactive rebase with autosquash:
```bash
git rebase --autosquash origin/main
```
## 4. Commit Message Review
After rebase completes, verify the commit message matches the changes:
1. Display the rebased commit:
```bash
git show HEAD --stat
```
2. Compare the commit message body with the actual changes
3. If the message is inaccurate or incomplete:
- Draft a corrected commit message following the `commit-message` rule
- Explain what needs to be updated and why
- Update with `git commit --amend`
## 5. Post-Rebase Actions
After message review:
1. Display the final commit history:
```bash
git log origin/main..HEAD --oneline
```
2. Inform the user to run `/publish` to push changes and update the PR
## Key Principles
- Use `--fixup=<hash>` to create fixup commits targeting specific commits
- `--autosquash` automatically merges fixup commits during rebase
- Review commit messages after rebase - compare with actual changes
- Update messages with `git commit --amend` when they don't accurately reflect the changes
- Commit messages follow the `commit-message` rule
Sections and files
Listed in source order.
sections -> 1. Initial Assessment → 2. Create Fixup Commit → 3. Autosquash Rebase → 4. Commit Message Review → 5. Post-Rebase Actions → Key Principles
terms -> You are assisting with fixing up an existing commit using interactive rebase. · 1. Show the commit history 2.
files/cmd -> git status · git fetch origin · git log origin/main..HEAD --oneline · git add . · commit-message · git commit --amend · /publish · --fixup=<hash>
body sha256 -> 7bff6bfb1af5
1. Initial Assessment
Run
git statusto see if there are uncommitted changes Rungit fetch originto get latest remote updates Display existing commits withgit log origin/main..HEAD --oneline2. Create Fixup Commit
If there are uncommitted changes: Show the commit history Ask user which commit hash to fixup (or identify it based on context) Stage changes with
git add .or ask which files to stage Create a fixup commit:4. Commit Message Review
After rebase completes, verify the commit message matches the changes: Display the rebased commit: Compare the commit message body with the actual changes If the message is inaccurate or incomplete: Draft a corrected commit message following the
commit-messagerule5. Post-Rebase Actions
After message review: Display the final commit history: Inform the user to run
/publishto push changes and update the PRKey Principles
Use
--fixup=<hash>to create fixup commits targeting specific commits--autosquashautomatically merges fixup commits during rebase Review commit messages after rebase - compare with actual changes Update messages withgit commit --amendwhen they don't accurately reflect the changes Commit messages follow thecommit-messagerule