How does git-spice simplify rebasing?

Instead of manual rebasing, git-spice uses 'restack' commands to automatically rebase all descendant branches in a stack when a parent branch is updated, maintaining their relationships.

What is a stacked branch workflow?

A stacked branch workflow is a method of breaking down a large feature into a series of smaller, dependent branches and pull requests that build upon each other sequentially.

Should I use gs or gsp commands?

The skill prefers gsp if available to avoid conflicts with Ghostscript, but it can dynamically detect and use either gs or gsp based on your environment.

Can I use standard git commands with git-spice?

Yes, you should still use standard git for adding files and committing, but use git-spice for stack navigation, branch creation, restacking, and PR submission.

How do I handle conflicts during a git-spice restack?

You resolve conflicts using standard git tools, add the files, and then use 'spice rebase continue' to finish the automated stack update process.

Git-Spice Stacked Branches

Name: Git-Spice Stacked Branches
Author: prateek

byprateek

0•

Developer Tools

Streamlines the management of stacked git branches and dependent pull requests using the git-spice CLI tool.

This skill equips Claude with the expertise to navigate and manage complex git-spice (gs/gsp) workflows, specifically focusing on 'stacked' branch development where multiple branches build upon one another. It provides a comprehensive reference for initializing repositories, tracking branch dependencies, and performing automated restacks to keep deep hierarchies of pull requests in sync. By guiding users through upstack, downstack, and stack-wide operations, it prevents common pitfalls like broken relationships during manual rebases and simplifies the submission of multi-part code reviews.

Key Features

01Stack-aware navigation and log visualization commands

02Intelligent restacking to keep dependent branches aligned with trunk

03Safety checklists to prevent destructive manual git operations

04Automated stack management for upstack and downstack branches

050 GitHub stars

06Streamlined multi-branch PR/CR submission and update workflows

Use Cases

01Managing a sequence of dependent pull requests for large feature releases

02Restacking an entire branch hierarchy after updating a middle-of-the-stack feature

03Adopting and tracking existing branch chains into a managed git-spice stack

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add prateek/dotfiles using-git-spice

For use in Claude.ai and ChatGPT

Download Skill