git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Sixt <j.sixt@viscovery.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Matt McClure <matthewlmcclure@gmail.com>, git@vger.kernel.org
Subject: Re: Avoiding broken Gitweb links and deleted objects
Date: Fri, 10 May 2013 09:03:52 +0200	[thread overview]
Message-ID: <518C9BD8.90508@viscovery.net> (raw)
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

  reply	other threads:[~2013-05-10  7:04 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-08 16:16 Avoiding broken Gitweb links and deleted objects Matt McClure
2013-05-09 20:04 ` Matt McClure
2013-05-10  6:07 ` Johannes Sixt
2013-05-10  6:37   ` Junio C Hamano
2013-05-10  7:03     ` Johannes Sixt [this message]
2013-05-10  7:04     ` Duy Nguyen
2013-05-10  7:16       ` Junio C Hamano
2013-05-10 10:33         ` Duy Nguyen
2013-05-10 16:22         ` Junio C Hamano
2013-05-22 13:25           ` Matt McClure
2013-05-22 17:39             ` Junio C Hamano
2013-05-10  7:34     ` William Swanson
2013-05-22 13:32       ` Matt McClure
2013-05-22 15:41         ` William Swanson

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

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

  git send-email \
    --in-reply-to=518C9BD8.90508@viscovery.net \
    --to=j.sixt@viscovery.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=matthewlmcclure@gmail.com \
    /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.
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 NNTP newsgroup(s).