Re: Rebasing cascading topic trees

More things I learned! So there are (at least) 2 possible approaches: using history, or using local tracking branches. The latter looks actually nicer to me, with the exception that if asks for a `git pull`. Using `git pull --rebase` actually also ends up with the same tree, but I like the

Re: Rebasing cascading topic trees

On Wed, Nov 16, 2016 at 04:12:20PM -0800, Norbert Kiesel wrote: > Yes, `git rebase --onto topic1 topic1@{1} topic2` is the answer! See also the `--fork-point` option, which (I think) should do this for you (and is the default if "topic1" is the configured upstream for topic2 and you just run

Re: Rebasing cascading topic trees

Yes, `git rebase --onto topic1 topic1@{1} topic2` is the answer! Thanks so much, learned something new today. On Wed, Nov 16, 2016 at 3:44 PM, Junio C Hamano wrote: > Norbert Kiesel writes: > >> I currently have a situation with cascading topic branches

Re: Rebasing cascading topic trees

Norbert Kiesel writes: > I currently have a situation with cascading topic branches that I need to > rebase > regularly. In the picture below, I want to rebase the tree starting with `E` > to > be rebased onto master (my actually cascade is 4 branches deep). > > A--B--C--D

Rebasing cascading topic trees

I currently have a situation with cascading topic branches that I need to rebase regularly. In the picture below, I want to rebase the tree starting with `E` to be rebased onto master (my actually cascade is 4 branches deep). A--B--C--D (master) \ E--F (topic1) \ G--H