Thread (1 message) 1 message, 1 author, 2017-01-20

Re: merge maintaining history

From: Junio C Hamano <hidden>
Date: 2017-01-20 17:33:58

Jakub Narębski [off-list ref] writes:
Then you would have the above history in repositories that fetched
refs/replace/*, and the one below if replacement info is absent:

   original A<-B<-C<-D<-E<-F<-----------M
                \                      /
   first branch  b<-c<-d<-e           /
                                     /
   new repo               e*<-f->g->h

But as Junio said it is highly unlikely that you are in this situation.
I do not think I said it is highly unlikely.  I just said that I
didn't read in what David wrote that he did some unusual things, so
I based my conclusion on that assumption.  People who bring problems
here sometimes forget to tell crucial details, and that missing
piece of information often changes how the situation should be
handled.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help