Stacked Diffs with git rebase —onto

>>flexdi+(OP)
I think ‘git rebase —-update-refs’ is the better way to go for this scenario

>>jbjbjb+kAe
Is there any good guide on how to solve the issue which OP solves?

>>enbugg+mGe
You don’t really need docs as --update-refs does what the OP does automatically instead of manually like the OP does.

>>sirsuk+lKe
How? I tried recreating the scenario from the article (the section "First rebase –onto") and ran the first rebase with "--update-refs":

  $ git checkout feature-1
  $ git rebase --update-refs main
  Successfully rebased and updated refs/heads/feature-1.
  Updated the following refs with --update-refs:
   refs/heads/feature-2-base

But all it did was update feature-2-base. It still left feature-2 pointing to the old commits. So I guess it automates "git branch -f feature-2-base feature-1" (step 3), but it doesn't seem to automate "git rebase --onto feature-1 feature-2-base feature-2" (step 2).

Presumably I'm doing something wrong?

>>ptx+00f
Yeah, you need to rebase the tip of the feature branch stack. git will then update all the refs that point to ancestor commits that are moved. So in this case

    $ git rebase --update-refs main feature-2

>>mhw+C5f
Thanks! Yup, that does the trick.

zlacker