How do I merge my work into the main branch?

While GitButler manages development, you should use standard Git commands (checkout main, merge, push) to integrate your completed virtual branches into the main branch.

How does GitButler differ from standard Git?

Unlike standard Git, GitButler allows multiple virtual branches to be active in the same workspace simultaneously, eliminating the need for constant branch switching to work on different features.

What is the 'but rub' command used for?

'but rub' is the core utility for organization; it allows you to assign specific file changes to branches, move commits between branches, or squash commits.

Is GitButler safe for my codebase?

Yes, GitButler includes an 'Oplog' and a snapshot system that acts as a safety net, allowing you to undo operations and restore previous workspace states easily.

Can I use GitButler alongside Graphite?

No, GitButler and Graphite use incompatible workflow models and should not be used together in the same repository to avoid state corruption.

GitButler Version Control

Name: GitButler Version Control
Author: outfitter-dev

byoutfitter-dev

0•

部署与 DevOps

Enables parallel multi-branch development and post-hoc change organization using GitButler's virtual branch workflow.

GitButler Version Control is a specialized skill for Claude Code that introduces virtual branches, allowing developers and AI agents to work on multiple unrelated features simultaneously within a single workspace. By decoupling changes from the traditional 'checkout' model, it enables a more fluid workflow where code can be written first and organized into specific branches later using the 'but' CLI. This skill is particularly effective for exploratory coding, managing complex stacked changes, and facilitating concurrent multi-agent collaboration without the friction of constant branch switching.

主要功能

01Multi-agent isolation within a single repository workspace

020 GitHub stars

03Post-hoc change organization using the 'but rub' command

04Visual and CLI-based organization of file hunks into branches

05Virtual branch management for simultaneous parallel development

06Operational safety through an integrated Oplog and snapshot system

使用场景

01Developing multiple independent features at once without switching branches

02Coordinating multiple AI agents working concurrently on different tasks in the same repo

03Organizing exploratory code into clean, logical commits after the implementation is complete

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add outfitter-dev/agents version-control

For use in Claude.ai and ChatGPT

Download Skill