From: Johannes Sixt <j.sixt@viscovery.net>
Date: Fri, 10 May 2013 07:03:52 GMT
Subject: Re: Avoiding broken Gitweb links and deleted objects
Message-ID: <518C9BD8.90508@viscovery.net>
In-Reply-To: <7vzjw349y0.fsf@alter.siamese.dyndns.org>

Am 5/10/2013 8:37, schrieb Junio C Hamano:
> What if we teach "git rebase" to record, perhaps by default, an
> "ours" merge on top of Y that takes the tree state of Y but has X as
> its second parent, ...

Please let's not go that route...

-- Hannes