nijaru/gitbutler-expert
dot_claude/skills/gitbutler-expert/SKILL.md
Use when the user asks for GitButler, the `but` CLI, virtual branches, stacked branches, multi-branch workspaces, GitButler PRs, or GitButler history editing.
tools
Updated Apr 26, 2026
$ install --global
skillsauthnpx skillsauth add nijaru/dotfiles gitbutler-expertInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Apr 26, 2026, 12:14 PM59.9s1 file scanned
SKILL.md
- name:
- gitbutler-expert
- description:
- Use when the user asks for GitButler, the `but` CLI, virtual branches, stacked branches, multi-branch workspaces, GitButler PRs, or GitButler history editing.
- allowed-tools:
- Bash, Read
GitButler CLI (but)
Iron Law
In a GitButler-managed repo, use but for VCS writes. Do not run git add, git commit, git push, git checkout, git merge, git rebase, git stash, git cherry-pick, or git reset. Read-only Git inspection is fine.
If a repo is not set up for GitButler, do not run but setup unless the user asked to adopt GitButler for that repo.
Operating Model
- Applied branches share one workspace. No checkout is needed.
- Unassigned changes live in
zz. Assign changes to branches/stacks before committing. - CLI IDs are session-local. Read them from current
but status -fv,but diff, orbut show; do not guess or reuse stale IDs. - Add
--status-afterto mutation commands when the command supports it. - Use
but oplogandbut undofor recovery.
Default Flow
but status -fv
but branch new <branch> # if new work needs a branch
# edit files
but status -fv # refresh IDs
but diff <file-or-hunk-id> # inspect targeted changes
but commit <branch-id-or-name> -m "type(scope): message" --changes <id>,<id> --status-after
Use but commit <branch> --only -m "..." --status-after only after staging exactly the intended changes to that branch. Without --only or --changes, but commit includes all uncommitted changes eligible for the target branch.
Command Patterns
| Task | Command |
| :--- | :--- |
| Status with IDs | but status -fv |
| Diff target | but diff <id> |
| New parallel branch | but branch new <name> |
| New stacked branch | but branch new <name> -a <anchor> |
| Stack existing branch | but move <child-branch> <parent-branch> --status-after |
| Unstack branch | but move <branch> zz --status-after |
| Assign file/hunk | but stage <file-or-hunk-id> <branch> --status-after |
| Commit selected changes | but commit <branch> -m "msg" --changes <ids> --status-after |
| Absorb fixup | but absorb <file-id> --dry-run, then but absorb <file-id> --status-after |
| Amend into commit | but amend <file-id> <commit-id> --status-after |
| Squash/reorder/move | but squash ... --status-after / but move ... --status-after |
| Pull updates | but pull --check, then but pull --status-after |
| Push | but push <branch-id-or-name> --dry-run, then but push <branch-id-or-name> |
| PR | but pr new <branch-id-or-name> --draft unless the user asked for ready review |
Conflicts
GitButler rebases can succeed while leaving conflicts inside commits.
- Run
but status -fvand identify conflicted commits. - Enter resolution mode:
but resolve <commit-id>. - Read/edit conflicted files; remove all conflict markers.
- Check progress with
but resolve status. - Finish with
but resolve finish.
Do not use Git write commands while resolving. Do not run but resolve finish before editing and verifying the conflicted files.
Anti-Rationalization
| Excuse | Reality |
| :--- | :--- |
| "I'll just use git rebase -i" | Use but move, but squash, but amend, but absorb, or but rub; they understand applied branches. |
| "The ID was h0 earlier" | IDs are contextual. Refresh with but status -fv before mutations. |
| "The commit succeeded, so everything landed" | Check --status-after; dependency-locked changes may remain in zz. Stack the branch correctly, then commit. |
Related Skills
nijaru/second-pass
development
VerifiedTrustedCommunity
Use after completing a bug fix, feature, refactor, or tk task when the first implementation taught enough context to replace it with a simpler, cleaner, or more coherent version before finalizing.
SKILL.mdUpdated Apr 25, 2026
nijaru/zig-expert
development
VerifiedTrustedCommunity
Use when writing, migrating, or reviewing Zig code across recent stable versions (0.14-0.16), especially to correct stale syntax or stdlib, build.zig, allocator, formatting, or runtime API knowledge.
SKILL.mdUpdated Apr 22, 2026
nijaru/writer
documentation
VerifiedTrustedCommunity
Use when reviewing or revising text (prose, docs, commits) to remove AI patterns and improve voice/clarity.
SKILL.mdUpdated Apr 22, 2026
nijaru/twitter
content-media
VerifiedTrustedCommunity
Use when fetching X/Twitter post content by URL, or searching for recent X posts.
SKILL.mdUpdated Apr 22, 2026