git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Jakub Narębski" <jnareb@gmail.com>
Cc: "David J. Bakeman" <nakuru@comcast.net>,
	Jacob Keller <jacob.keller@gmail.com>,
	Git mailing list <git@vger.kernel.org>
Subject: Re: merge maintaining history
Date: Fri, 20 Jan 2017 09:33:48 -0800	[thread overview]
Message-ID: <xmqqpojhy6tf.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <38ca43cb-2fc7-0448-352f-7d9413f815c5@gmail.com> ("Jakub Narębski"'s message of "Fri, 20 Jan 2017 12:37:37 +0100")

Jakub Narębski <jnareb@gmail.com> 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.

  reply	other threads:[~2017-01-20 17:33 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-14  2:01 merge maintaining history David J. Bakeman
2017-01-15  6:24 ` Jacob Keller
2017-01-19 13:12   ` David J. Bakeman
2017-01-19 21:42     ` Junio C Hamano
2017-01-20 11:37       ` Jakub Narębski
2017-01-20 17:33         ` Junio C Hamano [this message]
2017-01-26  0:31         ` David J. Bakeman
2017-01-26  0:41           ` Jacob Keller
2017-01-19 21:58     ` Philip Oakley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqpojhy6tf.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=jacob.keller@gmail.com \
    --cc=jnareb@gmail.com \
    --cc=nakuru@comcast.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).