Slash Command

/rebase

From jj

Rebases the current jj changeset stack onto the latest trunk: fetches updates, identifies stack root, performs rebase, displays log, and reports conflicts.

Git

Bash

git-workflow

Install

npx claudepluginhub jeffh/claude-plugins --plugin jj

Prompt Preview

# Rebase Current Stack

Rebase the current changeset stack onto the latest trunk.

## Process

1. **Fetch latest changes:**
   

2. **Identify the stack root:**
   
   - This finds the earliest changeset in the current stack that's not on trunk
   - If this returns nothing, you're already on trunk - nothing to rebase

3. **Rebase the stack:**
   
   - This rebases the entire stack (from root through `@`) onto trunk
   - Uses the same revset expression to ensure consistency

4. **Show result:**
   

## Handling Conflicts

If rebase reports conflicts:
1. Run `jj status --no-pager` to see conf...

Command Content

Other plugins with /rebase

/rebase

Rebases current feature branch onto latest upstream branch, resolves conflicts, runs full test suite, and reports branch details, commits rebased, and conflicts resolved.

update-branch

1.0k

/rebase

Rebases current branch onto target branch safely: auto-commits changes, creates backup ref, resolves conflicts automatically favoring target, runs lints/tests, provides summary and smoketest guide.

spectre

119

/rebase

Rebases current branch onto specified feature branch using worktrees and tmux, with automatic conflict resolution. Launches tmux session for monitoring progress.

Bash

worktree-task

/rebase

Interactively rebase current branch onto target (default origin/main), with safety checks, conflict guidance, and post-rebase push reminder.

git-smart

/rebase

Rebase current branch onto target branch (defaults to main/master), resolve conflicts interactively, and optionally force-push with safety checks.

ReadBashGrep+2

cata-helpers

/rebase

Interactive git rebase with visual plan and AI-powered commit improvements

opusBash("${CLAUDE_PLUGIN_ROOT}/scripts/rebase/rebase":*)

git-tools

Stats

Parent Repo Stars12

Parent Repo Forks2

Last CommitDec 16, 2025

Actions

View Source View Plugin View on GitHub View README

Tags

# Rebase Current Stack Rebase the current changeset stack onto the latest trunk. ## Process 1. **Fetch latest changes:** 2. **Identify the stack root:** - This finds the earliest changeset in the current stack that's not on trunk - If this returns nothing, you're already on trunk - nothing to rebase 3. **Rebase the stack:** - This rebases the entire stack (from root through `@`) onto trunk - Uses the same revset expression to ensure consistency 4. **Show result:** ## Handling Conflicts If rebase reports conflicts: 1. Run `jj status --no-pager` to see conf...

Rebase Current Stack

Rebase the current changeset stack onto the latest trunk.

Process

Fetch latest changes:

jj git fetch

Identify the stack root:

jj log -r 'roots(::@ ~ ::trunk())'

This finds the earliest changeset in the current stack that's not on trunk
If this returns nothing, you're already on trunk - nothing to rebase

Rebase the stack:

jj rebase -s 'roots(::@ ~ ::trunk())' -d trunk()

This rebases the entire stack (from root through @) onto trunk
Uses the same revset expression to ensure consistency

Show result:

jj log

Handling Conflicts

If rebase reports conflicts:

Run jj status --no-pager to see conflicted files

Report the conflicts to the user

Do NOT attempt to resolve automatically - let the user decide how to proceed

Edge Cases

Empty working copy (@ has no changes):

This is normal in jj - the working copy can be empty

The rebase still works; it rebases the stack

Already on trunk:

If roots(::@ ~ ::trunk()) returns nothing, inform the user they're already up to date

trunk() not configured:

If trunk() fails, fall back to checking for main@origin or master@origin:

jj log -r 'main@origin | master@origin' --no-graph -T 'self.bookmarks()'

Use whichever exists (prefer main@origin)

Notes

trunk() is jj's built-in revset for the primary branch (respects repo config)

-s rebases the source and all descendants

::@ means "all ancestors of @ including @"

~ ::trunk() excludes trunk and its ancestors

Rebase Current Stack

Rebase the current changeset stack onto the latest trunk.

Process

Fetch latest changes:
```
jj git fetch
```
Identify the stack root:
```
jj log -r 'roots(::@ ~ ::trunk())'
```
- This finds the earliest changeset in the current stack that's not on trunk
- If this returns nothing, you're already on trunk - nothing to rebase
Rebase the stack:
```
jj rebase -s 'roots(::@ ~ ::trunk())' -d trunk()
```
- This rebases the entire stack (from root through @) onto trunk
- Uses the same revset expression to ensure consistency
Show result:
```
jj log
```

Handling Conflicts

If rebase reports conflicts:

Run jj status --no-pager to see conflicted files
Report the conflicts to the user
Do NOT attempt to resolve automatically - let the user decide how to proceed

Edge Cases

Empty working copy (@ has no changes):

This is normal in jj - the working copy can be empty
The rebase still works; it rebases the stack

Already on trunk:

If roots(::@ ~ ::trunk()) returns nothing, inform the user they're already up to date

trunk() not configured:

If trunk() fails, fall back to checking for main@origin or master@origin:

jj log -r 'main@origin | master@origin' --no-graph -T 'self.bookmarks()'

Use whichever exists (prefer main@origin)

Notes

trunk() is jj's built-in revset for the primary branch (respects repo config)
-s rebases the source and all descendants
::@ means "all ancestors of @ including @"
~ ::trunk() excludes trunk and its ancestors