From: David <bouncingcats@gmail.com>
Date: Thu, 02 Jun 2011 11:18:06 GMT
Subject: Re: Can't get git rebase --onto to work
Message-ID: <BANLkTi=P_-XbmeJiUs2FaEfXLksKM6jRgw@mail.gmail.com>
In-Reply-To: <BANLkTik-o=h05=d5JH_LirYQkNzgdYaZxg@mail.gmail.com>

On 2 June 2011 20:58, Howard Miller <howard@e-learndesign.co.uk> wrote:
>
> The examples are very helpful but it could be a little more explicit
> which branches are going to get modified by the rebase. Once there are
> several branches in play it becomes quite a hard think.
>
> Mostly, I just needed a kick to say "look where the branch heads are
> pointing" (in the example diagrams) before and after the rebase. I
> don't think I would have got it without the remark in Pro Git that a
> final merge is required to get the HEADs where I wanted them. Like
> most things - it's completely obvious when you know.

If you have a graphical environment, it might help to take a look with
'gitk --all'.
Also, if you start it before the rebase, then after the rebase you
will need to use its "File>Reload" command to refresh the display.