Working with stacked branches in Git is easier with –update-refs (2022)

Graphite costs $25/month per user and there's no free tier I can use on enterprise. No matter what productivity gains I might derive from Graphite, I will never be able to convince my boss to pay for it, just because there's no way to prove that said gains exist.

And because there's no individual tier, I couldn't pay for it myself if I wanted to. Honestly, I would if I was forced to switch to GitHub, because stacking on Gerrit has increased my productivity by 2x as I'm no longer blocked on code reviews. Even a tiny pay gain because I'm now a top performer is worth the $25/month to me.

Re: Working with stacked branches in Git is easier with –update-refs (2022)

#9

Post by 3np » Sun, Jul 14, 2024, 11:27 PM UTC

> To rebase the part-2 and part-3 branches, we would have to run something like this:

    # Rebase commit 4 and commit 5 on top of the part-1 branch
    git checkout andrew/feature-xyz/part-2
    git rebase HEAD~2 --onto andrew/feature-xyz/part-1

    # Rebase commit 6 on top of the (now rebased) part-2 branch
    git checkout andrew/feature-xyz/part-3
    git rebase HEAD~ --onto andrew/feature-xyz/part-2

What's the supposed benefit of this over simply the following?

    git rebase andrew/feature-xyz/part-1 andrew/feature-xyz/part-2

    git rebase andrew/feature-xyz/part-2 andrew/feature-xyz/part-3

Re: Working with stacked branches in Git is easier with –update-refs (2022)

#10

Post by 3np » Mon, Jul 15, 2024, 1:56 AM UTC

randoglando wrote: post #4

Does this work with `git pull --rebase`?

Yes. It also works with `git status`, `git log`, and `git push --force-with-lease`.

(It's not clear what you're asking about)