On 2 June 2011 11:52, Tim Guirgies <lt.infiltrator@xxxxxxxxx> wrote: > On Thu, Jun 02, 2011 at 11:43:19AM +0100, Howard Miller wrote: >> Hi Tim, >> >> Thanks for the lengthy post :) As I said in my previous post, I >> think/hope I have resolved it. I did read the manpage first (I'm not >> so brave not to before posting here!!) and it did what it said it >> would. I just misinterpreted it. A final merge was required. I >> actually picked that up from the "Pro Git" book page which mentions >> that extra step. > > Well, I'm confused, but that'll be due to my ignorance. I very much doubt it :) It'll be me failing to explain properly. > > > 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html