GitButler
summary
GitButler ships a CLI called butt that builds real Git commits and adds stacked and parallel branches, butt status-f to list files per commit, and multiple per-branch staging areas so unrelated edits live in separate stacks. Commands let users create empty commits (butt new), move files between commits, squash or uncommit with butt rub j, mark a target commit to auto-amend, and replay or undo actions via an oplog. All commands emit JSON with -J for scripting; the demo shows it working despite UI hiccups.
AI-written summary · about
chapters (10)
- 0:00GitButler and CLI
- 1:45Butt CLI features
- 3:11Multiple staging areas and rub
- 5:21Rubbing concept and uses
- 7:30Advanced commit manipulation
- 8:57Creating commits with butt new
- 10:26Marking commits and stacking
- 11:49Oplog for undo and restore
- 13:17JSON output for scripting
- 13:37Q&A on conflicts
related talks
53mThe Power of Modern Version Control
07mGit is Hard but Time Traveling in Git Isn't
27mTaking code to next level with Open Source (Git & Github)
37mFork It Harder Make It Better
31mGitBucket: Open Source Self-Hosting Git Server
59mGit as Blockchain
50mPijul: Version-Control Post-Git
49mComparing and Contrasting Patman Vs B4 for Posting Patches