git-rebase-mcp
This server provides a safe, agent-friendly interface for performing Git rebase and other conflict-generating operations. It catches silent Git errors, prevents unsafe actions, and offers structured conflict resolution.
Pre‑flight check: Inspect a rebase before starting to identify dropped commits, untracked file collisions, and already‑upstream changes.
Safe rebase lifecycle: Start (
rebase_start), continue (rebase_continue), skip (rebase_skip), and abort (rebase_abort) rebases with automatic handling of untracked files, optional autosquash, custom commit‑check commands, and backup tags.Conflict inspection: View conflicts as two diffs (branch vs. replayed commit) with enclosing function context and summaries — not raw conflict markers.
Structured resolution: Choose a side (
branchorreplaying), keep both, or supply final content. Refuses to stage files containing conflict markers.Safe amend: Amend a commit only when
HEADis truly the commit being applied, preventing accidental folding of commits at conflicted stops.Todo list management: Read or replace the rebase plan, with protection against silently dropping commits.
Post‑rebase verification: Verify the branch still makes the same net change, scan for leftover conflict markers, and restore stashed files.
General conflict support: Works for any conflicted Git operation (cherry‑pick, revert, merge, stash pop).
Key safety features: Prevents amending at unsafe states, refuses conflict markers in resolutions, guards against dropped commits, and validates final branch integrity.
Provides tools for safely managing git rebases, including preflight checks, conflict resolution, amending, and verifying that the branch's overall change is preserved.
Click on "Deploy Server".
Wait a few minutes for the server to deploy. Once ready, it will show a "Started" state.
In the chat, type
@followed by the MCP server name and your instructions, e.g., "@git-rebase-mcp Show me the conflicts in this rebase"
That's it! The server will respond to your query, and you can continue using it as needed.
Here is a step-by-step guide with screenshots.
git-rebase-mcp
By agents, for agents.
Written by one that mangled its own branch three times in an afternoon and took it personally.
An MCP server that lets an agent drive a git rebase — or a cherry-pick, a
revert, a merge, or whatever else left three stages in the index — without
quietly wrecking the history on the way through.
Git is very good at rebasing and very bad at mentioning when it went wrong. Each of these exited zero and reported success:
Amending at a conflicted
editstop.editnormally stops withHEADon the commit just applied, but when it stops because of a conflictHEADis still the previous commit.git commit --amendthere silently folds two commits into one. Nothing in git's output distinguishes the two situations.A hand-written todo list that dropped three commits. They vanished without a warning.
Staging a file that still contained conflict markers. Two commits shipped
<<<<<<<into the tree.
No error, no warning, no non-zero exit. An agent has no reason to look, and by the time anybody does, the branch is three commits further on.
Try it
uv tool install --from git+https://github.com/aaron-riact/git-rebase-mcp git-rebase-mcpPoint your agent at git-rebase-mcp (see Install it for the
config snippets) and ask it to rebase something. Nothing is touched until you say
so — rebase_preflight is read-only and will tell you what the rebase would do,
including which commits a todo silently drops.
If it does start, the tip is tagged first. git reset --hard to that tag undoes
the whole thing.
Related MCP server: git-surgeon-mcp
What it does about it
Refuses the unsafe operation rather than documenting it. rebase_amend is
not callable at a conflicted stop, and the refusal says why and what to do
instead:
Refusing to amend: the rebase is conflicted, and HEAD (2c806c04b 'base') is not a commit this step created. Stopped part-way through applying 87f3d0fd4 (third). That commit does not exist yet, so HEAD is still the one before it and amending would rewrite the wrong commit. Resolve the conflicted paths, then continue.
Says when a stop is the last one. An edit step stops for you once its
commit applies — unless it conflicts, in which case the conflict is that stop.
--continue commits the resolution and moves to the next step, and the commit
you meant to change goes past unchanged. Git says nothing, and the advice above
is true and beside the point: a caller can follow it exactly, resolve, continue,
and lose the edit. So action_stop_lost says so and the guidance says what to do
instead — stage the change now, with the resolution, because --continue commits
everything staged. A conflicted reword is worse and gets the same warning: it
finishes the whole rebase still carrying the original message, and reports
success.
Shows a conflict as two intents, not as marker soup. Per contested region it reports what each side did to the common base:
──── branch so far ──── ──── replaying: "Use delta_count" ────
def counts(packages): def counts(packages):
- if packages: if packages:
- rows = [] rows = []
- for package in packages: for package in packages:
+ rows = [] - rows.append(delta(package))
+ for package in packages: + rows.append(delta_count(package))
return rows return rows"The branch has not replayed the wrap yet" against "the fix swaps the call, and leaves the wrap alone". Composing those needs no reasoning about which of three interleaved blocks belongs to whom.
Each side also gets a sentence — "adds 1 line and reindents or moves 3 lines"
against "adds 1 line and removes 1 line" — because a block wrapped in an if
produces a diff the size of the block and a change of one line, and the diff
alone does not say which you are looking at.
Each region is headed by the definition it sits in — @@ -662,13 +662,12 @@ def counts_render(self, ctx): — worked out by git's own funcname driver for the
language, of which it ships twenty-five. Git applies one only where a repository
asked for it in .gitattributes, and most have not; its fallback then recognises
a definition at column 0 only, which in any language whose definitions nest names
the class every time and the method never. So this server picks the driver, and
picks nothing else: the patterns stay git's, and a language it has never heard of
is named as well as one it has.
Both sides get to state their intent. The replayed commit has its message; the branch so far is an accumulation with no message, so each region names the commits behind its lines — which is the nearest equivalent, and is left empty rather than guessed when the lines predate the rebase.
Offers the resolution rather than making it. resolve takes
take="both" | "branch" | "replaying" for the cases the two diffs make obvious,
so answering costs one call instead of sending a whole file back. auto_resolve
will compose conflicts where the two sides touched different lines and carry on
without stopping, but it is off by default: lines that do not overlap can
still contradict each other — one side adding a call, the other removing the
helper it needs — and a conflict resolved without being read has to be reviewed
afterwards anyway.
Says when the question is whether a path lives at all. A modify/delete does
not look like a conflict: git leaves the surviving side's text in the working
file with no markers in it, so nothing about the file says one side deleted it.
It is reported as that, with the side named, and take then means a side rather
than a text — the side that deleted the path stages the deletion. It used to
compose the file's blocks, of which there are none, and stage the empty string
that fell out: an empty file in the commit, the path no longer conflicted, and
nothing downstream with a reason to complain. The guidance also points out that
such a deletion is often half of a rename, in which case what the incoming side
did to the old path has to be reapplied to the new one.
Splits a commit without being reached past. rebase_split takes the commit
a step just applied back out, leaving its changes in the working tree to commit
as several. Doing that by hand — git reset HEAD^ at an edit stop — is the one
move that leaves a rebase where --amend rewrites the commit before the one you
mean, and git's own record still says amending is safe through it. Now the state
says unapplied, amending is refused, and proceed refuses while any of the
commit is still outside a commit. That last one matters most for a file the
commit added: the reset leaves it untracked, and git rebase --continue
neither refuses nor picks it up. It reports success, and the change is simply
not in the branch.
Knows the upstream from the landing place. git rebase --onto exists because
a branch cut from a history that has since been rewritten needs both: the old
upstream is the only thing that still says which commits are the branch's own,
and the rewritten history does not, because the same work is there under other
shas. Given only the landing place, a branch of seven commits reads as seventy —
and the checks then fire correctly and unhelpfully, refusing over the sixty-three
a todo "would drop". onto= says what was meant instead, and the finish check
measures upstream..old tip against onto..new tip rather than guessing a
merge-base that reaches back past the upstream.
Records where the branch was, and checks the result against it. What must
stay the same is the change the branch makes to its base -- not the resulting
tree, which changes for good reason when the rebase also moves onto newer
upstream work. A difference is usually a report of damage, and this is what
caught all three errors above. Usually, because a deliberate redistribution
looks the same from there — a commit dropped because the new base already has
it, or one commit's work moved into others — so the report says which:
tree_identical means the content is exactly what it started as, and nothing was
lost but the branch's own share of it.
The quiet ones
A refusal handles the failures git could have caught. The harder class is the one where git behaved perfectly and the result is still wrong — nothing to refuse, nothing to report, no exit code to read. Those get counted and named instead:
What went quiet | What is said |
A resolution rewrote more than the contested region and re-added lines merged below it | Lines the staged text has more copies of than either side had |
A resolution was written from memory instead of from the file, and dropped code neither side touched | Lines both sides kept that the staged text has none of |
A conflicted file's other hunks were merged silently, and the commit has since moved | How many hunks landed outside the contested regions |
A todo replays a commit ahead of one it used to follow | Which commits moved, and past what |
None of these refuse anything: composing two sides legitimately duplicates a shared line, rewriting a region legitimately drops one, and reordering is what a todo is for. They exist because a clean merge is silent by construction, and the one thing an agent will not do is go and look without a reason.
Each was found by making the mistake. The last two came from resolving one region of a reordered commit and shipping the second hunk it had merged in the meantime — a call to a function that did not exist yet on that branch. The file parsed, the suite passed, the build was green.
It is not only for rebases
A rebase is not the only thing that leaves three stages in the index. A cherry-pick, a revert, a merge, a rebase you started by hand, a stash that popped into a conflict — git records all of them the same way, which is what the conflict view reads. So the tools work on any of them:
status: state=conflicted operation=cherry-pick
A cherry-pick of 47ba527eb (side change) left 1 path conflicted.
Nothing has been committed yet. Call conflicts to read them…
proceed: runs `git cherry-pick --continue`, because `git rebase --continue`
does not finish a cherry-pickstate stays conflicted whatever produced it, so one check answers the
question; operation says what to expect. This was a false negative until
recently: anything that was not a rebase read as "no rebase in progress", which
conflicts reported as "Nothing is conflicted." — of a repository with
unmerged paths sitting in the index.
A conflict nothing recorded — the popped stash — is reported as
operation="unknown", with its regions read exactly as any other. What it does
not get is a proceed or an abort, because there is no operation to finish
and no way to know what undoing it would discard.
The rebase-specific safety stays rebase-specific: the backup tag, the branch-change check and the amend refusal are all about rewriting history, which a cherry-pick is not doing.
Tools
Tool | Works on | |
| What a rebase would do. Changes nothing. Names commits a todo would drop, and — since reordering is when a commit stops sitting on what it was written against — which commits a todo moves ahead of ones they used to follow. | rebase |
| Tags the tip, moves aside colliding untracked files, begins. | rebase |
| Typed state, what operation is in progress, and whether | any |
| Each contested region as two diffs, headed by the definition it sits in, plus the incoming commit's message. Also | any |
| Stages a resolution: | any |
| Amends — only where | rebase |
| Takes this step's commit back out, changes left in the tree, to commit as several. | rebase |
| Carries on, by the operation's own | any |
| Drops the commit being applied — for one already in the base. | rebase, cherry-pick, revert |
| The steps left, and replaces them. Refuses to drop a commit. | rebase |
| Checks the branch still makes the same change to its base, and names any commit that brought a conflict marker to a file. | rebase started here |
| Pairs the commits replayed so far against the originals, mid-rebase. | rebase started here |
| Abandons the operation and puts back what was moved aside. | rebase, cherry-pick, revert, merge |
The prefix carries the distinction: rebase_ is for the tools that only make
sense inside a rebase — a todo, an amend, a check against where the branch was —
and the bare names are for the ones that read or drive a conflict whatever
produced it. If a name has no prefix, it does not care how you got here.
rebase_start takes a check_command, run after every commit. It is the only
thing that catches a step which applies cleanly and still leaves the tree
broken -- a resolution that drops a line, say, so the file no longer parses.
Use it.
check_halts=False stops it being a gate at all: the command runs at each stop
and the result comes back in the report, and nothing halts. That is the shape for
a rebase somebody is watching, where the question at each stop is "what does the
suite say here?" held against a baseline — and where a gate would halt on the
branch's own history instead. Asked to replay seven commits and test each, I did
not reach for the gate at all: four of the seven were legitimately red, so the
suite got run by hand at every stop.
Add check_edits_only=True if you want a gate but the branch was not green at
every commit to begin with, which most are not: a budget or a fixture raised one commit after the code
that needed it is red in between, and a check after every commit then halts the
rebase on history that was already like that. Narrowing it to the commits you
stop at keeps the part that was wanted — prove the commits I changed are sound —
and drops the part that only rediscovers what the branch was.
Install it
One stdio server, one command, no arguments and no environment. Put it on your
PATH:
uv tool install --from git+https://github.com/aaron-riact/git-rebase-mcp git-rebase-mcpThen point your agent at git-rebase-mcp. Most harnesses take the same shape
and differ only in where the file lives and what the top-level key is called:
{
"mcpServers": {
"git-rebase": { "command": "git-rebase-mcp" }
}
}Harness | Where | Key |
Claude Code |
|
|
Cursor |
|
|
Gemini CLI |
|
|
Codex CLI |
|
|
VS Code (Copilot) |
|
|
Zed |
|
|
The two that are not JSON-with-mcpServers:
# ~/.codex/config.toml
[mcp_servers.git-rebase]
command = "git-rebase-mcp"// .vscode/mcp.json — "servers", not "mcpServers"
{ "servers": { "git-rebase": { "type": "stdio", "command": "git-rebase-mcp" } } }If the server fails to start in an editor launched from a desktop icon rather
than a shell, it is PATH: those processes do not read your shell profile, so
~/.local/bin is missing. Give the absolute path — which git-rebase-mcp — as
the command.
Every tool takes a repo argument, defaulting to the working directory, so one
installation serves every repository you work in.
For development, clone it and uv sync; uv tool install --from . git-rebase-mcp
installs the working tree instead of the published remote.
Prior art
The conflict view is DiffDiff's idea. It shows the same two diffs in vim, and its documented wishlist — commit messages as labels, conflict counts, resolve-with-ours/theirs — anticipates most of this tool surface. This server is that insight delivered to an agent instead of a buffer, wrapped in the rebase state machine.
The regions are DiffDiff's too, and that matters more than it looks. Git's merge has already decided which parts of a file could not be reconciled, and marked exactly those; DiffDiff diffs the three sides of one such block and never sees the rest of the file. Working the regions out independently -- diffing whole sides against the whole base and intersecting -- re-derives that decision badly: two independent diffs cannot know what a merge could reconcile, so a block one side has not reached yet gets fused with a one-line change beside it, and one side ends up with nothing to say. This server made that mistake first and measured it: 4556 characters for one conflict, of which one side was 104 lines of unchanged context. Asking git for the blocks instead brought the same conflict to 289.
Design notes
docs/plan.md — the design, and what is deliberately left out.
docs/decisions/0001-python-rather-than-rust.md — including the two things Rust would have done better, and how each is recovered here.
docs/decisions/0002-git-s-funcname-drivers-rather-than-tree-sitter.md — why naming what a region sits inside did not need a parser, and why the language patterns are git's rather than this server's.
Rebase state is a closed union of four types rather than fields on one object,
so rebase_amend accepts one type instead of testing a set of conditions that
could drift apart from the states. patiencediff rather than difflib, because
the default matcher pairs up the wrong blocks in files that repeat — a test file
being the obvious case — and those hunk boundaries are the main output.
Status
The rebase tools are complete and tested, and have driven the same 21-commit
branch twice. They caught two defects nothing else would have — a syntax error
committed into 8 of 10 commits, and a fixup whose test depended on a commit
scheduled after it.
A third run, tidying a branch whose TypeScript conversion had been split from
the feature that prompted it, produced the four fixes above: take staging an
empty file where the branch had renamed one away, an edit stop reported as "a
run of 0 fixup or squash steps", no way to divide a commit without reaching past
the tools, and a deliberately dropped commit called damage. Each was found by
using the thing, and each is now a test.
A fourth run drove a stack of three branches through six rebases — a squash, two reorders, and a branch replayed onto a rewritten version of the history it was cut from. The two-intents view earned itself there: it turned a conflict that looked like "pick one of these event listeners" into "these are two different events, keep both", which reading markers would not have.
It also produced the last three entries in The quiet ones,
each by getting it wrong first — a resolution written from memory that deleted a
component, a route lookup and a memo comparator, and a reordered commit shipping
a call to a function that did not exist yet. Both were caught by diffing the staged result against HEAD by hand.
That is still the check nothing here replaces; the counts only tell you when to
bother running it.
What they do not yet do is save much time: nine of eleven conflicts in one run were mechanical shapes resolved by a hand-written script. Phase 2 is planned against that measurement rather than against a feature list, and says how to tell whether it worked.
Contributing
Bug reports from agents are welcome and, so far, are where every feature came from. If the server let you do something destructive, that is the interesting kind of issue: say what you called, what git did, and what you expected — the gap between those two is the whole design brief.
Development
uv sync
uv run pytest # builds real repositories and runs real git against them
uv run pyrightTests use scratch repositories rather than mocks. The point of the server is that it agrees with git, so mocking git would test nothing worth testing.
Available Tools
11 toolsrebase_abortA
Abandon the rebase and put back anything that was moved aside.
Inputs: repo. Returns: head, guidance, restored
rebase_amendA
Amend the commit this rebase has just applied.
Refused at every other kind of stop. At a conflicted stop the commit being replayed has not been created yet, so HEAD is still the one before it and amending would fold two commits into one -- silently, and reported by git as success.
stage_tracked stages modifications to files git already tracks. It will
not add untracked files: those are never part of what a rebase is
rewriting, and sweeping them in is how a stray binary or somebody's local
notes end up in history.
Inputs: repo, message, stage_tracked. Returns: after, before, guidance
rebase_conflictsA
Report each conflict as what the two sides did, rather than as markers.
Per contested region you get two diffs from the common base: one for the
branch built so far, one for the commit being replayed. Read them as two
intents and compose them -- "wrap this block in an if" plus "swap this
call" is usually just both.
Regions only one side changed are not listed: git merged those already.
context is how many unchanged lines to show around each change. Raise it
when the region is hard to place -- which function it is in, whether the
lines above already do what the replayed commit is adding. Set
include_full_sides for the three whole texts when even that is not enough.
Inputs: repo, context, include_full_sides. Returns: files, guidance, replaying, replaying_body
rebase_continueB
Carry on with the rebase, and report where it stops next.
Refused while any path is still unmerged, which is the other way a marker reaches a commit.
auto_resolve behaves as it does in rebase_start, and is off for the same
reason: deciding a conflict without reading it is not this tool's job.
Inputs: repo, auto_resolve. Returns: head, step, state, action, +7 more
rebase_finishA
Check the finished rebase against the tip it started from, and tidy up.
What must stay the same is the change the branch makes to its base -- not the resulting tree, which legitimately changes when the rebase also moves onto newer upstream work. A difference here is a report of damage: a commit dropped from the todo, or a conflict resolved the wrong way. Every rewritten commit is also scanned for conflict markers, since one committed part-way and tidied up later still leaves a commit nobody can build.
The backup tag is kept either way; deleting the only record of where the branch was is not this tool's decision to make.
Inputs: repo, allow_change. Returns: ok, commits, guidance, restored, +4 more
rebase_preflightA
Check what a rebase would do, without starting it or changing anything.
Reports commits the todo would drop silently, commits it names that are not in the range, commits whose change is already in the base under a different sha, anything already in progress or uncommitted, and untracked files a replayed commit would collide with.
Inputs: base (required), repo, todo. Returns: base, commits, dropped, unknown, +6 more
rebase_resolveA
Stage the resolved content for one conflicted path.
Three ways, in rough order of how much they cost to use:
take="both","branch"or"replaying"resolves every conflict block in the file the stated way. "both" keeps the branch's lines then the replayed commit's, which is what two insertions at the same point almost always mean. Cheapest, and it cannot introduce a typo.no arguments stages what is already in the working tree, for a file large enough that sending it back costs more than editing it in place.
contentwrites the finished file and stages it.
Every route refuses content that still contains conflict markers. Staging
one is how a commit ends up with <<<<<<< in it, and nothing downstream
catches that.
Inputs: path (required), repo, take, content. Returns: path, guidance, still_conflicted
rebase_skipA
Drop the commit being replayed and carry on.
For a commit whose change is already in the base under a different sha, or one whose conflict resolves to "the branch already says this". Git offers it at every conflict; without it here the only way to take that offer is to reach past these tools and run git by hand, which is how a rebase ends up half driven from each side.
Refused when nothing is being replayed: skipping is a decision about a
commit, and at a break or a failing exec there is no commit in question.
Inputs: repo, auto_resolve. Returns: head, step, state, action, +7 more
rebase_startA
Begin a rebase onto base, and report where it stops.
Refuses anything rebase_preflight called unsafe, unless force. Before
starting it tags the current tip, so the result can be checked against it,
and moves aside untracked files a replayed commit would collide with.
autosquash folds every fixup! and squash! in the range into the commit
its subject names, which is the workflow git commit --fixup sets up. It
cannot be combined with a todo, since it is a way of generating one.
check_command is run after every commit, which is the only thing that
catches a step that applies cleanly but leaves the tree broken.
auto_resolve composes conflicts where the two sides touched different
lines and carries on without stopping. Off by default: lines that do not
overlap can still contradict each other -- one side adding a call, the other
removing the helper it needs -- and a conflict resolved without being read
has to be reviewed afterwards anyway. Use it when replaying a branch whose
conflicts you already understand.
Inputs: base (required), repo, todo, force, +3 more. Returns: status, stashed, guidance, backup_ref
rebase_statusA
Report what the rebase in repo is currently doing.
Call this before amending, continuing or resolving. In particular
head_is_replaying_commit distinguishes a stop where the commit was applied
from one where it conflicted part-way, which git's own output does not.
Inputs: repo. Returns: head, step, state, action, +7 more
rebase_todoA
Read the steps a running rebase has left, or replace them.
Worth having because the need shows up mid-run: a fixup turns out to
depend on a commit scheduled after it, and the fix is to move one line
rather than to abandon thirty resolved conflicts and start again.
Replacing the list can drop commits exactly as writing one badly can, so
the same check applies: a commit in the remaining steps and not in the
replacement is refused unless force. Lines that name no commit -- exec
above all -- are counted too, and dropping every exec silently turns off
the per-commit check, so that is called out rather than assumed.
Inputs: repo, todo, force. Returns: dropped, guidance, remaining
Tool Schema Changelog
Recent tool additions, removals, and schema changes observed during successful MCP inspections.
Loading tool schema changelog…
TDQS
Scored across 11 tools
Each tool addresses a distinct phase of the rebase lifecycle: status, conflicts, resolve, todo, preflight, start, amend, continue, finish, skip, abort. No two tools have overlapping purposes; descriptions reinforce clear boundaries.
All tool names follow the exact same pattern: 'rebase_' + a verb or noun (e.g., rebase_start, rebase_abort, rebase_todo). Consistent snake_case and predictable structure make the set easy to navigate.
11 tools is well-scoped for a git rebase focused server. Each tool covers a necessary part of the workflow without redundancy, and the count feels neither sparse nor bloated.
The toolset covers the full rebase workflow: preflight checks, starting, monitoring, conflict resolution, amending, continuing, skipping, aborting, and final verification. No obvious missing operation is apparent for the stated purpose.
Related MCP Connectors
One MCP server for all your MCP servers: code mode, per-tool permissions, approvals and audit.
A MCP server built for developers enabling Git based project management with project and personal…
The MCP server that vets MCP servers: identity, risk grade and per-tool risk before you install.
The MCP server for Azure DevOps, bringing the power of Azure DevOps directly to your agents.
Related MCP Servers
- AlicenseAqualityFmaintenanceAn MCP server that enforces safe git commits by allowing only specified files and providing fixup capabilities for earlier commits.21MIT
- AlicenseAqualityDmaintenanceAn MCP server that gives AI agents safe, non-interactive Git history editing — squashing, rewording, and reflog rescue — without ever hanging on a Vim buffer.4MIT
- AlicenseAqualityDmaintenanceA local MCP server that provides a safe, explicit set of Git operations for version control tasks like status, diff, branching, staging, committing, fetching, merging, and pushing.135 npmMIT
- AlicenseNot gradedqualityAmaintenancean MCP server that auto-resolves Git merge conflicts so agents only touch the complex hunks — deterministic pattern engine with confidence scores and a full decision trace, plus merge/rebase preview and hunk-level resolution tools199MIT