Re: merge maintaining history

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 20, 2017, 17:33 UTC
Message-ID: <xmqqpojhy6tf.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <38ca43cb-2fc7-0448-352f-7d9413f815c5@gmail.com>

Jakub Narębski <jnareb@gmail.com> writes:

Show 10 quoted lines

> 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.