Re: Can't get git rebase --onto to work

From: Tim Guirgies <lt.infiltrator@gmail.com>
Date: Jun 2, 2011, 11:18 UTC
Message-ID: <20110602111825.GC4709@Imperial-SSD-Overlord>
In-Reply-To: <BANLkTik-o=h05=d5JH_LirYQkNzgdYaZxg@mail.gmail.com>

On Thu, Jun 02, 2011 at 11:58:36AM +0100, Howard Miller wrote:

> On 2 June 2011 11:52, Tim Guirgies <lt.infiltrator@gmail.com> wrote:
> I very much doubt it :) It'll be me failing to explain properly.

I wasn't fishing for compliments; I'm actually confused about that fast-forward merge. Why do you need it? What are you fast-forwarding and where to?

Show 13 quoted lines

> On 2 June 2011 11:52, Tim Guirgies <lt.infiltrator@gmail.com> wrote:
> > As for the manpage, though, as someone who read and misunderstood it, do
> > you have any suggestions for its improvements?
> 
> 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.

I'll try to prepare a patch and see if I can improve the wording at all. I'd like you to have a look over it, if you don't mind, and with your recent episode fresh in your mind, review it as if you were reading it in that situation for the first time.

Can you please also point out which section of the doc caused you confusion?

Tim

-- 
() ascii ribbon campaign - against html e-mail
/\ www.asciiribbon.org   - against proprietary attachments