Git rebase in depth

Re:Git rebase in depth by gwright on Friday May 10, 2019 @04:55PM (#19882146)

Or you could just rebase component2 when you learn that component1 has been updated on master:

    *     F: (master) Merge branch 'component2'
    |\
    | *   E: (component2) Implemented component 2 (now with updated component1)
    |/
    *     C: (master) Refactored component 1's API
    |
    *     A: (master) Base

So we've lost B and D from your example, but who cares about those commits?

[ Parent | on HN ]

Re:Git rebase in depth by Nullabillity on Friday May 10, 2019 @05:49PM (#19882565)

That's easy in the trivial example where nothing else happened in the meantime.

[ Parent | on HN ]