Getting it into your agent
One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.
npx agentmods add commands/oalders/kitchen-sink/git-rebasegit clone --depth 1 https://github.com/oalders/kitchen-sinkWrote this? Show the measurements
A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.
[](https://agentmods.dev/commands/oalders/kitchen-sink/git-rebase)<a href="https://agentmods.dev/commands/oalders/kitchen-sink/git-rebase"><img src="https://agentmods.dev/badge/commands/oalders/kitchen-sink/git-rebase.svg" alt="Measured on agentmods" height="20"></a>What it costs to keep this loaded
Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5 | $0.00013 | $0.00426 |
| Opus 5 | $0.00006 | $0.00213 |
| Sonnet 5 | $0.00003 | $0.00085 |
| Haiku 4.5 | $0.00001 | $0.00043 |
Grade A, and why
git-rebase scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 4d ago.
A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.
Nothing flagged
None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.
What it actually says
Rebase the current branch onto the remote default branch, resolving any conflicts that arise.
Steps:
-
Detect the default branch. Prefer
main; fall back tomasterifmaindoes not exist on the remote:- Run
git ls-remote --heads origin main— if the output is non-empty, usemain - Otherwise run
git ls-remote --heads origin master— if non-empty, usemaster - If neither exists, stop and ask the user which branch to rebase onto
- Use the detected name as
<base>in the steps below
- Run
-
Create a todo list with these tasks:
- Fetch latest changes from origin/
- Pull changes from origin/ into current branch (with rebase)
- Identify and resolve merge conflicts
- Verify resolution and complete merge
-
Fetch the latest changes:
git fetch origin <base> -
Pull with rebase:
git pull --rebase origin <base>- ALWAYS use
--rebaseflag (never plaingit pull) - This keeps a clean linear history
- ALWAYS use
-
If conflicts occur:
- Read each conflicted file to understand the conflict
- Resolve by keeping both changes when appropriate, or choosing the correct version
- After editing, stage the resolved file:
git add <file> - Continue the rebase:
git rebase --continue
-
Verify the final state:
git status -
Update todo list to mark tasks completed as you progress
-
Inform the user:
- What conflicts were resolved and how
- The final state of the branch
- If a force push is needed (branch has remote counterpart), use
git push --force-with-lease- NEVER use
--force- it can overwrite others' work --force-with-leasefails safely if remote has new commits
- NEVER use
What this file has done since we first saw it
Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.
- 4d ago First seen · 42 lines · 13 tokens per session scan A 079fc8e78431
git-rebase is a command published in the GitHub repository oalders/kitchen-sink (4 stars, last pushed 4d ago), licensed MIT. It adds 13 tokens to every session and 426 once invoked, about $0.0001 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.
Other commands, from other repositories
git
Git operations with intelligent commit messages and workflow optimization.
checklist
Generate a custom checklist for the current feature based on user requirements.
clarify
Identify underspecified areas in the current feature spec by asking up to 5 highly targeted clarification questions and encoding answers back into the spec.
specify
Create or update the feature specification from a natural language feature description.
analyze
Perform a non-destructive cross-artifact consistency and quality analysis across spec.md, plan.md, and tasks.md after task generation.
converge
Assess the current codebase against the feature's spec, plan, and tasks, then append any remaining unbuilt work as new tasks to tasks.md so implement can complete it.