graphite-cli

This is exactly the problem that graphite-cli solves (https://github.com/screenplaydev/graphite-cli) It keeps track of branchs and their parents by storing a tiny bit of metadata in the native git refs. It uses that information to perform recursive rebases: https://github.com/screenplaydev/graphite-cli/blob/main/src/... It ends up working seamlessly - you just modify some branch, and then run `gt stack fix` to recursively rebase everything. (and then `gt stack submit` to sync everything to github :) docs here: https://docs.graphite.dev/guides/graphite-cli

We tried manually rebasing too, before building Graphite. The challenge you face with manual rebasing is two parts: 1) If you update the bottom branch, you need to manually rebase each branch above it. That becomes brutal if your stack is >3 branches. 2) You cant perform a simple rebase-onto, because you'll copy all commits between the higher branch and trunk. You'd have to perform a three-way rebase, specifying the range of commits you'd like to copy onto the destination. This becomes infeasible by hand. Graphite-cli gets around this by tracking branch metadata and storing it in native git refs (https://graphite.dev/blog/post/y6ysWaplagKc8YEFzYfr). When you rebase a stack, it recursively performs the three-way merge to fix things up smoothly. On top of this, git provides no good mechanisms for submitting the stack. Graphite cli can submi

Great question! It does lots of things. The CLI (https://github.com/screenplaydev/graphite-cli) lets you: - Recursively rebase changes to keep your branches correctly stacked - Allow you to shift half of a stack onto a different branch - Open up PRs/push changes for all the branches in a stack - Offer to delete merged branches from local, rebases the remaining branches, and adjust github pr merge bases. The web dashboard lets you: - See an inbox of PRs spanning any number of repos, based on which ones need action - Navigate between PRs in a stack - Modify Prs, review, all of which is synced to Github - Shortcuts, client side caching for fast loading, Phabricator style interface, macros, landing a stack of PRs together, and much more :) Give the tool a try, we'd love to hear your feedback in the community Slack! https://join.slack.com/t/gr

The docs for the CLI and dashboard go into some more depth - might be what you're looking for? - https://docs.graphite.dev/guides/graphite-cli - https://docs.graphite.dev/guides/graphite-dashboard Re `git rebase --onto`, the open source CLI offers a recursive implementation to prevent you from having to carefully rebase each branch in your stack (https://github.com/screenplaydev/graphite-cli/blob/main/src/...) One of the reasons you cant use a simple rebase --onto is that you dont want to accidentally copy all downstack commits between the merge base and what you're restacking onto. The CLI tracks branch bases commits through git refs to ensure that restacking never duplicates commits.

The part of Graphite that helps manage stacked changes locally is open source - you can see how it handles the recursive rebases here: https://github.com/screenplaydev/graphite-cli/blob/main/src/...

We (Screenplay, https://screenplay.dev) built an internal tool (Graphite) to enable stacked diffs on GitHub for an individual (i.e. you can adopt it without your team also having to adopt it). It's inspired by some of the internal tooling we had at bigger companies. Specifically, the tool has two parts: * The CLI - https://github.com/screenplaydev/graphite-cli: Allows you to create diffs, restack them, submit them to GitHub, etc. It runs locally and stores all the metadata in your .git folder. * The website - https://app.graphite.dev/: A UI layer on top of GitHub (ultimately reads/writes from GitHub). OAuth in to have a better/customizable review queue and stack visualization, with notifs and an improved code review UI coming soon. You can use those two either separately or together. Would love people's feedback!