Junio C Hamano wrote: > Thomas Rast <trast@xxxxxxxxxxxxxxx> writes: > > +HELP, MY UPSTREAM HAS REBASED! > > +------------------------------ > > I read this section only once, but it looked reasonable as a recovery > procedure to me. Thanks a lot for your comments, I will look into the links you gave me. It occured to me that rebase's ability to skip existing commits can effectively replace the entire manual component of finding out when the topic branch started. Which makes it far less scary. :-( Maybe I'll write something about editing with 'rebase -i' instead, which breaks the automatic skips again. - Thomas -- Thomas Rast trast@xxxxxxxxxxxxxxx
Attachment:
signature.asc
Description: This is a digitally signed message part.