Teapot makes stacked diff workflows so easy you barely have to think about it. It shows your branches as a visual tree, helps you reshape stacks with drag and drop, and keeps frequent Git and GitHub actions handy, while being transparent enough so that nothing feels like incomprehensible magic (don't we all hate that?!).
Large rebases often fail/conflict halfway through. Teapot runs rebases as an interactive durable queue. Pauses on conflicts, and lets you resolve and resume without losing the large stack-wide rebasing plan. Most of the time, this means a couple of mouse clicks and less than 3 seconds.
For each branch in the stack, Tepot trackes the remote PR linked to it. Offers to create a PR with base branch detection, and to update a PR after amends with a force push. Teapot highlights out of sync branches and stale targets. No more half-rebased stacks, no more commits pointing at stale parents (bogus stack bifurcation). Stacks stay healthy and the whole state stays obvious.
- Download the latest release from Releases
- Open the downloaded DMG and drag
teapot.appto Applications
Note: macOS will show a security warning because the app is not code-signed yet. Run this once to bypass:
xattr -c /Applications/teapot.app
- Download
teapot-[version]-setup.exefrom Releases - Run the installer and follow the wizard
- Download the AppImage from Releases
- Make it executable and run:
chmod +x teapot-*.AppImage && ./teapot-*.AppImage
Teapot uses stacked branches. Instead of one big PR with hundreds of changes, you break your work into small branches that build on each other:
main
└── feature/auth-types ← PR #1 (ready to merge)
└── feature/auth-api ← PR #2 (in review)
└── feature/auth-ui ← PR #3 (draft)
Each branch has one focused change. Reviewers see small diffs. Reviews go faster.
- Create a branch for each logical change
- Stack branches on top of each other
- Open a PR for each branch
- Merge from the bottom up (several trunk merges, instead of a large one)
- Amend commits instead of adding new ones when iterating on a branch (i.e. phase)
Small PRs get reviewed quickly. You ship code while the next piece is still in review. Your git history stays clean.
Found a bug or have an idea? Open an issue.
Teapot is inspired by Superlog, a fantastic tool that introduced many developers to the stacked branches workflow. With Superlog no longer actively maintained, Teapot aims to carry the torch as an open-source alternative.