Post

okay folks, what’s the current state-of-the-art Stacked Diffs solution for github that doesn’t suck? i can’t do this manually anymore

Marc Agbanchenou

@marcagba.dev

28 Oct 2024

As others, I would say graphite, moreover it’s free for open source projects Since we moved to gitlab at work I go with `git rebase —update-refs` these days andrewlock.net/working-with...

andrewlock.netWorking with stacked branches in Git is easier with --update-refsIn this post I discuss how to use the new Git rebasing feature, --update-refs, and how it makes working with stacked branches/PRs easier.

Marc Agbanchenou

@marcagba.dev

Very nice synergy indeed! If I understood correctly, `git absorb -r —base origin/main` from the top of the stack and fixup commits are automatically created & applied wherever they should within the stack! 🪄

Andrew Lock "Sock"@andrewlock.bsky.social

That pairs very nicely with git absorb too! andrewlock.net/super-chargi...

andrewlock.netSuper-charging 'git rebase' with 'git absorb'In this post I describe the git-absorb tool, and show how it can super-charge your git rebase workflow, removing a huge amount of manual work!

28/10/24, 10:09 pm0 reposts4 likes

No replies yet.