GitButler replaces git with a virtual branch workflow where you can work on multiple features simultaneously without switching contexts. This skill teaches Claude to use the `but` CLI instead of standard git commands for commits, pushes, branches, and rebasing. The key thing here is the stacked branch model and dependency tracking, which means you need to follow specific patterns to avoid commit locks when files have history across branches. The recovery workflows for conflicts and reordering are more nuanced than plain git, so the skill includes detailed recipes for common tasks like amending, stacking branches, and resolving dependency issues. Worth using if you're already committed to GitButler's model, but it does require unlearning some git muscle memory.

skills.sh installs
933
GitHub stars
21.9K
last updated
Aug 21, 2026

Install

$ npx -y skills add gitbutlerapp/gitbutler --skill but --agent claude-code

Installs into .claude/skills of the current project.

Files

GitButler CLI Skill

Use GitButler CLI (but) as the default version-control interface.

Start Here

Choose the narrowest first command by task; avoid ritual status checks:

# Selected dirty files/hunks:
but diff

# Commit order, branch/stack placement, conflict overview:
but status

# File IDs, per-commit files, amend details:
but status -fv

# What one applied branch or commit changed, for review:
but diff <branch-or-commit>

# Details for one known branch or commit:
but show <id>

Do not run plain but status and then but status -fv unless the compact output lacks file details needed for the task.

For "commit just/only/specific changes on a new branch", use the fast path:

but diff
but commit -b <branch> -m "<msg>" <id> <id>

but commit -b <branch> ... creates the branch when it does not exist and prints the created commit. Do not run a separate but branch new, status command, or verification diff unless the task needs workspace information that the result does not provide.

Sponsors

Details

Repository
github.com/gitbutlerapp/gitbutler
Categories
Git & Pull Requests, Release Management
First seen
May 16, 2026
1github avatarsalesforce-apex-qualitygithub/awesome-copilotApex code quality guardrails for Salesforce development. Enforces bulk-safety rules (no SOQL/DML in loops), sharing model requirements, CRUD/FLS security, SOQL 885skills.sh installs
2boshu2 avatarvibeboshu2/agentopsValidate code readiness. Use when: doing a quick readiness or sanity check that code is ready to commit or ship, short of a full review.845skills.sh installs
3code-yeongyu avatarwork-with-prcode-yeongyu/oh-my-openagentFull PR lifecycle in a fresh task-owned git worktree: implement via the ulw-loop skill with mandatory evidence-bound manual QA → reviewer-readable English PR → 782skills.sh installs
4github avatarsalesforce-component-standardsgithub/awesome-copilotQuality standards for Salesforce Lightning Web Components (LWC), Aura components, and Visualforce pages. Covers SLDS 2 compliance, accessibility (WCAG 2.1 AA), 770skills.sh installs
5adobe avatarappbuilder-cicd-pipelineadobe/skillsSet up CI/CD pipelines for Adobe App Builder projects. Generates GitHub Actions workflows using adobe/aio-cli-setup-action@3 and adobe/aio-apps-action@3.3.0, pl761skills.sh installs
6posit-dev avatarcreate-release-checklistposit-dev/skillsCreate a release checklist and GitHub issue for an R package. Use when the user asks to "create a release checklist" or "start a release" for an R package.755skills.sh installs