From: Junio C Hamano <gitster@pobox.com>
To: Matt McClure <matthewlmcclure@gmail.com>
Cc: Duy Nguyen <pclouds@gmail.com>,
Johannes Sixt <j.sixt@viscovery.net>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Avoiding broken Gitweb links and deleted objects
Date: Wed, 22 May 2013 10:39:49 -0700 [thread overview]
Message-ID: <7vd2sikj6i.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAJELnLEOg+D+baAddJvDiYM=ej8PKsgi2MWH25enOijXa+bO_Q@mail.gmail.com> (Matt McClure's message of "Wed, 22 May 2013 09:25:25 -0400")
Matt McClure <matthewlmcclure@gmail.com> writes:
> On Fri, May 10, 2013 at 12:22 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> I think what I missed is that the same logic to ignore side branches
>> whose history gets cauterised with such an "ours" merge may apply to
>> an "ours" merge that people already make, but the latter may want to
>> take both histories into account.
>>
>> So I guess it is not such a great idea.
>
> The particular proposed implementation? Or the broader idea to save
> loose commits more permanently? I'm still interested in a solution for
> the latter.
Recording such an "otherwise should not be recorded as a merge" side
history as if it were "-s ours" merge is what I judged as "not a
great idea".
If you want to keep older commits, either you make sure you point at
them with some refs, or not prune the repository. I do not think of
any other solution offhand.
next prev parent reply other threads:[~2013-05-22 17:39 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
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 [this message]
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=7vd2sikj6i.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=matthewlmcclure@gmail.com \
--cc=pclouds@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).