Re: [RFC PATCH] Documentation: new upstream rebase recovery section in git-rebase

Junio C Hamano wrote:

Thomas Rast [off-list ref] writes:

quoted

+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@student.ethz.ch