git_rebase
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
| Name | Required | Description | Default |
|---|---|---|---|
| mode | No | One of: continue, abort, skip | |
| upstream | No | Branch or commit to rebase onto | |
| repo_path | No | Path to the git repository, defaults to '.' (the server working directory) | . |