Question

Okay I almost have this rebase thing figured out.

I can feel a breakthrough coming – here is the tipping point:

How do I do a rebase to go from:

A - - B - - C - - D - - E (HEAD)
|
\ - - F - - G (branch1)

To:

A - - B - - C - - D - - E (HEAD)
                  |
                  \ - - F - - G (branch1)

I don’t just want to merge HEAD~1 into branch1, I think I want to rebase branch1 right?

I feel like I almost grok this – help!?

Answer 1

This is a standard rebase, there’s nothing tricky going on. You want to:

git checkout branch1
git rebase D