Borrowing it
Nothing to install: this file belongs to MarcusJellinghaus/mcp-workspace. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.
curl -O https://raw.githubusercontent.com/MarcusJellinghaus/mcp-workspace/main/.claude/skills/rebase/SKILL.mdgit clone --depth 1 https://github.com/MarcusJellinghaus/mcp-workspaceWrote 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/skills/marcusjellinghaus/mcp-workspace/rebase)<a href="https://agentmods.dev/skills/marcusjellinghaus/mcp-workspace/rebase"><img src="https://agentmods.dev/badge/skills/marcusjellinghaus/mcp-workspace/rebase/github.svg" alt="Measured on agentmods" height="20"></a>Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.
<a href="https://agentmods.dev/skills/marcusjellinghaus/mcp-workspace/rebase"><img src="https://agentmods.dev/badge/skills/marcusjellinghaus/mcp-workspace/rebase.svg" alt="Reviewed on agentmods" width="80" height="20"></a>- NVIDIA SkillSpector warn
SkillSpector: 1 finding, up to high
These are SkillSpector’s own severities. On a checked sample its high-severity flags on skills were ~96% false positives — a documented command, a public API, a “never do X” rule — so we show them as a caution to read, not a verdict. Why →
- high Tool Misuse · line 15 Tool parameters are crafted to achieve unintended or unsafe behavior. Parameter abuse can bypass intended safety checks (e.g. shell=True, --force, dangerous glob patterns).Fix: Validate all tool parameters against an allowlist. Reject dangerous parameter values (shell=True, --force, -rf /) and use safe defaults.
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.1 | $0.00010 | $0.01114 |
| Opus 5.5 | $0.00004 | $0.00446 |
| Sonnet 5.5 | $0.00002 | $0.00223 |
| Haiku 4.5 | $0.00001 | $0.00111 |
Grade A, and why
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 1mo 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.
How it starts
The opening of the file, as written. The whole thing — 98 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Rebase Branch onto Base Branch
First Step
Call mcp__mcp-workspace__git with command "status" before doing anything else.
Rebase the current feature branch onto its base branch and resolve conflicts.
Core philosophy: Main is the source of truth. The feature branch adapts to main. For source code conflicts, preserve main's improvements and rework the feature branch code to fit.
Note on --ours/--theirs during rebase: --ours = main (the branch being rebased onto), --theirs = feature branch commits being replayed.
If the rebase becomes complex, suggest switching to cherry-picking as an alternative approach.
Determine Base Branch
Call mcp__mcp-workspace__get_base_branch to detect the correct base branch. Use the returned branch name in subsequent git commands.
Base Branch Confirmation
If the base branch is not main or master, ask the user to confirm before proceeding. Display the detected base branch and wait for explicit approval.
Pre-flight Checks (Abort if any fail)
- Working directory is clean (no uncommitted changes)
- Not already in rebase/merge state
- Not on main/master branch
- Remote origin exists
pr_info/does not exist on the base branch — if it does, abort with error:"pr_info/ exists on <BASE_BRANCH>. This folder should only exist on feature branches. Check your branch setup."
Workflow
- Call
mcp__mcp-workspace__gitwith command"fetch"and args["origin"] git rebase origin/${BASE_BRANCH}- For each conflict:
- If file is under
pr_info/: auto-resolve withgit checkout --theirs <file>(keep feature branch version), thengit add <file>— no user input needed - For all other files: resolve manually, preserving main's improvements; rework feature branch changes to fit
- Verify no conflict markers remain
git add <file>git rebase --continue
- If file is under
- Run code checks:
mcp__mcp-tools-py__run_pytest_check,mcp__mcp-tools-py__run_pylint_check,mcp__mcp-tools-py__run_mypy_check - Fix any issues from merge
- Report summary and ask for user confirmation
git push --force-with-lease
What ships with it
1 file beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.
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.
- 1mo ago First seen · 98 lines · 10 tokens per session scan A c5f8f9e9e5d8
rebase is a skill published in the GitHub repository MarcusJellinghaus/mcp-workspace (48 stars, last pushed today), licensed MIT. It adds 10 tokens to every session and 1,114 once invoked, about $0.0000 per session on Opus 5.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-30.
Other skills, from other repositories
polish-docs-meta
Finalize documentation and project metadata for a ship-ready release. Use after implementation is complete, tests pass, and devcheck is clean. Safe to run at any stage — each step checks current state and only acts on what still needs work.
report-issue
File a bug or feature request against this repository (cyanheads/git-mcp-server) using the gh CLI. Use for tool logic bugs, git provider misbehavior, transport issues, auth/config problems, or new feature proposals.
maintenance
Investigate, adopt, and verify dependency updates. Captures what changed, understands why, cross-references against the codebase, and runs final checks. Supports two entry modes: run the full flow end-to-end, or review updates you already applied.
release-and-publish
Ship a release end-to-end across every registry this project targets (npm, MCP Registry). Runs the final verification gate, pushes commits and tags, then publishes to each applicable destination. Assumes git wrapup (version bumps, changelog, commit, annotated tag) is already complete — this skill is the post-wrapup…
papi-build
Invoke when executing a build via buildexecute. Covers branching, gestalt pre-build check, and post-build audit.
papi-auto
Continue an approved PAPI cycle through implementation, verification and review using bounded autonomy. Resume durable work without rebuilding it; propose new scope before persisting it.