Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/src/integrations/claude.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ stack-sync

### stack-restack

Rebase all branches to ensure proper ancestry.
Rebase branches with scoped or multi-stack targeting to ensure proper ancestry.

```bash
stack-restack
Expand Down
2 changes: 1 addition & 1 deletion internal/cli/integrations/agents.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ var stackSkillSummaries = []struct {
{"stack-modify", "Amend current branch commit"},
{"stack-plan", "Plan and create stack from uncommitted changes"},
{"stack-resolve", "Resolve rebase conflicts with AI assistance"},
{"stack-restack", "Rebase all branches in stack"},
{"stack-restack", "Rebase branches with scoped or multi-stack targeting"},
{"stack-review", "Apply PR review comments and mark resolved"},
{"stack-split", "Split changes between current and new child branch"},
{"stack-status", "View stack state and health"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ After successful absorb (all branches pass), use `AskUserQuestion`:
- Question: "Changes absorbed successfully. What would you like to do next?"
- Options:
- label: "Restack to propagate (Recommended)"
description: "Rebase all branches to ensure consistency"
description: "Rebase affected branches to ensure consistency"
- label: "Submit changes"
description: "Push absorbed changes to update PRs"
- label: "Done for now"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ After all issues are fixed and verification passes, use `AskUserQuestion`:
- label: "Submit updates (Recommended)"
description: "Push fixed branches to update PRs"
- label: "Restack branches"
description: "Rebase all branches to ensure consistency"
description: "Rebase affected branches to ensure consistency"
- label: "Done for now"
description: "No follow-up action needed"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
description: Rebase all branches to ensure proper ancestry
description: Rebase branches with scoped or multi-stack targeting
model: haiku
allowed-tools: Bash(stackit:*), Bash(git:*), AskUserQuestion, Skill
---
Expand All @@ -13,7 +13,7 @@ allowed-tools: Bash(stackit:*), Bash(git:*), AskUserQuestion, Skill

## Task

Rebase all branches in the stack to ensure proper parent-child ancestry.
Rebase branches with the narrowest safe scope to ensure proper parent-child ancestry.

**Preconditions** (check context above):
- Must have clean working directory (no uncommitted changes)
Expand Down
Loading