skills.rest
nebinfra
nebinfraOFFICIAL
Explore all skills by this author →
Website𝕏@nebinfraGitHub

neb-task-rebase

Rebase all feature branches onto latest upstream main across root repo and submodules.

Updated Aug 23, 2026
Search Tags:#automation#git#devops#worktrees#rebase#submodules
One-click install
npx skills add https://github.com/nebinfra/nebcore-ai-skills --skill neb-task-rebase
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: neb-task-rebase
Source: https://github.com/nebinfra/nebcore-ai-skills/tree/main/neb-task-rebase
Command: npx skills add https://github.com/nebinfra/nebcore-ai-skills --skill neb-task-rebase

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Rebase all feature branches across the current workspace (root repo + submodules) onto the latest upstream main. This keeps feature branches up to date without manual intervention.

Core Features & Use Cases

  • Autonomous rebasing across multiple repos, including root and submodules.
  • Safe handling of dirty working trees via stash and restore, with conflict reporting.
  • Deterministic workflow: fetches origin/main, rebases, and reports new commits.

Quick Start

Run neb-task-rebase in your workspace to automatically rebase all feature branches onto the latest upstream main.

Frequently Asked Questions about neb-task-rebase

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I automatically rebase feature branches onto upstream main?▼

To automatically rebase feature branches, this Skill fetches origin/main and rebases all branches across the root repo and submodules onto the latest upstream main with no user interaction required.

What happens to uncommitted changes when rebasing git worktrees?▼

When rebasing git worktrees, the Skill safely handles dirty working trees by stashing uncommitted changes and restoring them after the rebase operation completes.

Can I rebase submodules autonomously across an entire workspace?▼

Yes, you can rebase submodules autonomously across an entire workspace, as the Skill applies deterministic rebasing to the root repository and all submodules simultaneously.

Does automated git rebasing work with conflict resolution hooks?▼

Automated git rebasing works with conflict resolution hooks by integrating them into the deterministic workflow, providing comprehensive reporting of new commits and any conflicts encountered.

What is the best way to keep feature branches up to date with main without manual intervention?▼

The best way to keep feature branches up to date with main without manual intervention is running an autonomous workspace rebase that fetches upstream changes and reports new commits.

Why does rebasing multiple git branches fail when working trees are dirty?▼

Rebasing multiple git branches fails with dirty working trees because uncommitted changes block the rebase, which this Skill solves by stashing and restoring changes automatically.

Related Skills

Explore More Software Engineering Skills→
mvillmowmvillmow
18

worktree-sync

Syncs Git worktrees by fetching remote and rebasing or merging main into feature branches.

Community
Basic
beemanbeeman
3

gh-pr-rebase

Rebase a GitHub PR branch onto the repository default branch with conflict handling.

Community
Advanced
coco-researchcoco-research
264

gsd-new-workspace

Create isolated git workspaces with separate repos and planning directories.

Community
Advanced
bmsull560bmsull560

jr-rebase

Resolves git rebase conflicts in feature branches via guided marker resolution.

Community
Intermediate