Skip to main content
Glama
jesspig

git-mcp-server

by jesspig

git_rebase

Destructive

Rebase the current branch onto an upstream to keep feature branches up to date and maintain a linear history. Use modes 'continue', 'abort', or 'skip' to manage in-progress rebases and resolve conflicts.

Instructions

Rebase the current branch onto an upstream, or manage an in-progress rebase with mode='continue', 'abort', or 'skip'. Use this to keep a feature branch up to date with its base and produce a linear history. Does NOT create a merge commit — use git_merge to record integration; on conflict, resolve and call with mode='continue', or mode='abort' to cancel. Best for: keeping a feature branch up to date with its base. Returns: confirmation text or git rebase output; use git_log afterwards to see the rewritten history.

Input Schema

TableJSON Schema
NameRequiredDescriptionDefault
modeNoOne of: continue, abort, skip
upstreamNoBranch or commit to rebase onto
repo_pathNoPath to the git repository, defaults to '.' (the server working directory).
Behavior4/5

Does the description disclose side effects, auth requirements, rate limits, or destructive behavior?

Annotations declare destructiveHint=true, readOnlyHint=false, and idempotentHint=false. The description goes beyond this by explaining that rebase rewrites history (use git_log to see rewritten history) and by describing conflict-resolution behavior (mode='continue'/'abort'). It does not repeat the annotations but adds operational context. No contradiction detected.

Agents need to know what a tool does to the world before calling it. Descriptions should go beyond structured annotations to explain consequences.

Conciseness5/5

Is the description appropriately sized, front-loaded, and free of redundancy?

The description is compact and well-structured: it front-loads the primary action, then explains use cases, differentiates from git_merge, provides conflict-handling steps, and ends with return-value guidance. Every sentence earns its place, with no redundant filler.

Shorter descriptions cost fewer tokens and are easier for agents to parse. Every sentence should earn its place.

Completeness5/5

Given the tool's complexity, does the description cover enough for an agent to succeed on first attempt?

No output schema exists, but the description explicitly notes returns ('confirmation text or git rebase output') and suggests following up with git_log to see rewritten history. It covers the main operations (start, continue, abort, skip), distinguishes from merge, and explains the conflict workflow. This is complete for the tool's scope.

Complex tools with many parameters or behaviors need more documentation. Simple tools need less. This dimension scales expectations accordingly.

Parameters4/5

Does the description clarify parameter syntax, constraints, interactions, or defaults beyond what the schema provides?

Schema coverage is 100% with descriptions for all three parameters. The description enriches semantics by clarifying that mode is for managing an in-progress rebase, and that upstream is the target for a new rebase. This adds meaning beyond the raw schema, particularly for mode's role in the workflow.

Input schemas describe structure but not intent. Descriptions should explain non-obvious parameter relationships and valid value ranges.

Purpose5/5

Does the description clearly state what the tool does and how it differs from similar tools?

The description clearly states the action ('Rebase the current branch onto an upstream') and also covers the management of in-progress rebases with mode='continue'/'abort'/'skip'. It explicitly differentiates from git_merge by stating it does NOT create a merge commit, making its purpose unambiguous among sibling tools.

Agents choose between tools based on descriptions. A clear purpose with a specific verb and resource helps agents select the right tool.

Usage Guidelines5/5

Does the description explain when to use this tool, when not to, or what alternatives exist?

Provides explicit guidance: 'Use this to keep a feature branch up to date with its base and produce a linear history' and 'Best for: keeping a feature branch up to date with its base'. It also gives an alternative (git_merge) and explains the conflict workflow (resolve and continue, or abort), so when-to-use and when-not-to-use are both covered.

Agents often have multiple tools that could apply. Explicit usage guidance like "use X instead of Y when Z" prevents misuse.

Install Server

Other Tools

Latest Blog Posts

MCP directory API

We provide all the information about MCP servers via our MCP API.

curl -X GET 'https://glama.ai/api/mcp/v1/servers/jesspig/git-mcp-server'

If you have feedback or need assistance with the MCP directory API, please join our Discord server